commit | a2b8a756dba78e9c6e86717da0610e2826587ead | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 02 09:21:03 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 02 09:21:03 2012 -0700 |
tree | 74f25fe97f8b088baeb209568355d5bf5c909198 | |
parent | 7d910aabe3de5d16e6aa94176753f7a6ed74e3dd [diff] | |
parent | d7be21ee78a9d1d3cb425f3163f5c19848325037 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Iea091cf0ec873075e14c7a17ed185e9cbde68d1c