commit | 7c6658ea71f5aa3a3614cd2dbde123b831850e55 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Dec 11 11:53:49 2012 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Tue Dec 11 11:53:49 2012 -0800 |
tree | d49f7a8817419c93ad64c77dc8acabde709a71e3 | |
parent | 7cd204914ef59c4ce96210539489ec3e76942bb4 [diff] | |
parent | aa81ebb808db18285dabf0d6b3bc33a2bb0c7045 [diff] |
Reconcile with jb-mr1.1-release - do not merge Change-Id: Idcf1a5e4acf53a40deeb6304d83a734722c7aff4