commit | f6c38f14fbcc167a9cc045632d61c7fe16fe5574 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 27 08:28:51 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 27 08:28:51 2012 -0800 |
tree | 3ef98e33bbb459b19e1c85fe5a6edb953c843a5f | |
parent | 26ede9823f507da5be5784b75c5fc4e6169426f5 [diff] | |
parent | 743ee8ec569719f994dc949527f354d58654681d [diff] |
am 743ee8ec: (-s ours) am bd7ba9ee: (-s ours) Merge jb-mr1-dev into aosp/master - do not merge * commit '743ee8ec569719f994dc949527f354d58654681d':