| commit | fcd0987a4a047318377c6b77363ecbf645293951 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Mar 12 14:20:51 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 12 14:20:51 2013 +0000 |
| tree | 98290727d621e5a023631aaf86277200da67d836 | |
| parent | e673999ddc5d96e863ece8c51175c16dde50ad0b [diff] | |
| parent | 81ab2eb2c85d084374abbcbfc2bf3f2383c28b7a [diff] |
am 81ab2eb2: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '81ab2eb2c85d084374abbcbfc2bf3f2383c28b7a':