summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2011-01-29 09:54:41 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-29 09:54:41 -0800
commit41cce7b013ec77852b43c8ae3a4b61ff10f75ad9 (patch)
tree1e0b03164753ed7a9a5fb5e98a5cd900288a6580
parent91e7b0562dfb9def27be42761057614d41234206 (diff)
parentbfa2f13fd3f463dbceea4d3a18c3124e70df0a05 (diff)
downloadframeworks_av-41cce7b013ec77852b43c8ae3a4b61ff10f75ad9.zip
frameworks_av-41cce7b013ec77852b43c8ae3a4b61ff10f75ad9.tar.gz
frameworks_av-41cce7b013ec77852b43c8ae3a4b61ff10f75ad9.tar.bz2
am 2ba92c71: (-s ours) do not merge bug 3370834 Cherrypick from master
* commit '2ba92c71b5684dce700cf848bf157153c156df1d': do not merge bug 3370834 Cherrypick from master
0 files changed, 0 insertions, 0 deletions