| commit | 4b6df88e969042d5a1b0a49d3929f60e1af5fb92 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri May 17 12:59:38 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 17 12:59:38 2013 -0700 |
| tree | 55c1615b1b1f64d54e58adac9275ecf9cbf0bd04 | |
| parent | f368399e58895b3b686eb890a248ef44932da915 [diff] | |
| parent | 27b4511d4bee1ae302de2af0fd14c6b7361a7590 [diff] |
am 27b4511d: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '27b4511d4bee1ae302de2af0fd14c6b7361a7590':