commit | 4508ef49c00319af7ad0e9630b385b4f786ee959 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue May 21 09:02:35 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 21 09:02:35 2013 -0700 |
tree | 3f5adfd7058eff9874d29f1bb6c3c42f7bdeada8 | |
parent | 71952461310cff9f35a4852415c608d14c92236a [diff] | |
parent | 084753eedba485673fd070c44bc4a7feb63af483 [diff] |
am 084753ee: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '084753eedba485673fd070c44bc4a7feb63af483':