summaryrefslogtreecommitdiffstats
path: root/libs/binder
diff options
context:
space:
mode:
authorJoe Fernandez <joefernandez@google.com>2011-10-12 14:39:58 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-10-12 14:39:58 -0700
commit5b2dda3be5cc903aafb77ce7902c14d76eb26a9b (patch)
tree050664c9b935dcac205cdf2c657109f9c1a71a77 /libs/binder
parent17d8e4160f0c34fffe692d9d799049efc74ed3e4 (diff)
parent99b70f3f5d051261229d1792c169a374fc23326b (diff)
downloadframeworks_base-5b2dda3be5cc903aafb77ce7902c14d76eb26a9b.zip
frameworks_base-5b2dda3be5cc903aafb77ce7902c14d76eb26a9b.tar.gz
frameworks_base-5b2dda3be5cc903aafb77ce7902c14d76eb26a9b.tar.bz2
am 99b70f3f: (-s ours) DO NOT MERGE cherrypick from master Change-Id: I63bc055991405c56e9dcc83a54b106b870cf6b29
* commit '99b70f3f5d051261229d1792c169a374fc23326b': DO NOT MERGE cherrypick from master Change-Id: I63bc055991405c56e9dcc83a54b106b870cf6b29
Diffstat (limited to 'libs/binder')
0 files changed, 0 insertions, 0 deletions