| commit | 6d101328e34557fa251b7d52d4d8dbf59620d099 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri May 17 12:56:09 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 17 12:56:09 2013 -0700 |
| tree | 4b2f32a38c7fc8a9b335139206586d394acf9dfa | |
| parent | bd398c64c368615a810c9658798dbe8ec44978e8 [diff] | |
| parent | 81972daf3323a130ca06c9999a3a8530e33fece9 [diff] |
am 81972daf: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '81972daf3323a130ca06c9999a3a8530e33fece9':