| commit | 69bb4e42c58780b6b98cf8a20cac548474dfb6f9 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Mar 05 00:56:08 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 05 00:56:08 2013 +0000 |
| tree | ae4b1ec5a307b6947599d6451b0403d7d94231e1 | |
| parent | 0410d3ef3d9578177bffb06a657b1addab605167 [diff] | |
| parent | 564c2b3e4da71cfe4f1a0c8e15e2c9cec2415eea [diff] |
am 564c2b3e: Reconcile with jb-mr1.1-release - do not merge * commit '564c2b3e4da71cfe4f1a0c8e15e2c9cec2415eea': JDQ39B