| commit | 849137b6ff087ffbe7bb33c400eef98c5d78b743 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Nov 05 08:00:20 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 05 08:00:20 2012 -0800 |
| tree | b012d7678c9ba215c95a9c3b7b116efa3cc8d13f | |
| parent | ece43bb6b90b6c1df843a200d0a610a90d48ee9a [diff] | |
| parent | 0e361198686403c02bd5d6a4f0fd9e04affff003 [diff] |
am 0e361198: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '0e361198686403c02bd5d6a4f0fd9e04affff003':