summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-11-29 09:49:34 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-29 09:49:34 -0800
commit2b556bc988161cdbbbdbae8db227a118a6a6f392 (patch)
tree69654c790917913b464ed59c26070655abe5a20f
parente402f1fde2deca0b1120e6d582ab9dce59879ae1 (diff)
parent6d93da465ab8fff02728f268785e59ab86a2a0c2 (diff)
downloadframeworks_native-2b556bc988161cdbbbdbae8db227a118a6a6f392.zip
frameworks_native-2b556bc988161cdbbbdbae8db227a118a6a6f392.tar.gz
frameworks_native-2b556bc988161cdbbbdbae8db227a118a6a6f392.tar.bz2
am 6d93da46: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '6d93da465ab8fff02728f268785e59ab86a2a0c2':
0 files changed, 0 insertions, 0 deletions