| commit | 5efeb0d9782cb1db1035eba11ad6747924278a58 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Apr 08 13:40:41 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 08 13:40:41 2013 -0700 |
| tree | b66120bed31e08044d76a1951f548af01f2ba1f4 | |
| parent | aaf5e3449f4086a5666aae71005bb8f5ad344fdc [diff] | |
| parent | 61ab904aa8ed8987ab8b5e1d57aa0b0e7da88a46 [diff] |
am 61ab904a: Reconcile with jb-mr2-release - do not merge * commit '61ab904aa8ed8987ab8b5e1d57aa0b0e7da88a46':