| commit | 7460402358ad67931f812ede5beab933753f333c | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:40:01 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:40:01 2012 -0800 |
| tree | b012d7678c9ba215c95a9c3b7b116efa3cc8d13f | |
| parent | d21e0f9ac595040bdec429d68094c6bacb4bced3 [diff] | |
| parent | 36f2f1b395a3c71a5f66e134accef3eff7664697 [diff] |
am 36f2f1b3: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '36f2f1b395a3c71a5f66e134accef3eff7664697':