diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2012-10-03 15:21:23 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-03 15:21:23 -0700 |
commit | c414e45db5c50161bd78c9e369679107843c60b6 (patch) | |
tree | 05f946f60b77358424a451df3e42d82c09dccf8c | |
parent | fbd18e1a04a49d1ff51e403b68f1a70a5fb19979 (diff) | |
parent | 06cf41b3aa46fc963d54196a0b3f4c0e09553d31 (diff) | |
download | android_device_common-c414e45db5c50161bd78c9e369679107843c60b6.tar.gz android_device_common-c414e45db5c50161bd78c9e369679107843c60b6.tar.bz2 android_device_common-c414e45db5c50161bd78c9e369679107843c60b6.zip |
am 06cf41b3: (-s ours) am c5adba2e: (-s ours) Reconcile with jb-dev - do not merge
* commit '06cf41b3aa46fc963d54196a0b3f4c0e09553d31':
0 files changed, 0 insertions, 0 deletions