commit | a6c3f0b46e7d19493f5f9f53295f384cefee2777 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Aug 02 11:26:23 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Aug 02 11:26:23 2012 -0700 |
tree | 9471807c3c5ea264c6f1724b4ccac82223747b61 | |
parent | a495fa4c69bca4f50bca1b6eb60d2e3761052de6 [diff] | |
parent | 7a3c07442356daa84a8e022b12efd69b24a88ea8 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: I34cec93953b7f525dd5f197fca616648ded151f4