| commit | 96c46273575a096de04c10efe91dbca3ac1214a3 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 10 11:11:58 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 10 11:11:58 2013 -0700 |
| tree | ee94564c72dd90a0e0666b578dbfa13e1bc857b0 | |
| parent | 8ea77542f9b0b1191abf868156dd1fd863935910 [diff] | |
| parent | 2f387da0ac1495f80ca5bc4c928e2b9c1e3fb040 [diff] |
am 2f387da0: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge * commit '2f387da0ac1495f80ca5bc4c928e2b9c1e3fb040': Add HTC One special edition (DO NOT MERGE)