| commit | 7e9863d9e280f01c490333bc3c9dbea0dc28ad66 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Sat Aug 08 17:54:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 08 17:54:27 2015 +0000 |
| tree | 33fb52badb33fc4a5572d2b91e6389d4ce4c5720 | |
| parent | b5dd18f49e266dc0d57aacaa8fee17840111f022 [diff] | |
| parent | 73f7cb3d9c756fd7a03464514c505d4b812debcb [diff] |
am 73f7cb3d: am 497bcc4d: am 5e5f2ab3: am 1ea2e463: am 6d181dc0: am 63c3068a: am 8314da1c: am 3728b128: am 97af61da: am 178f5eee: am e1baec5d: am 4393aeff: am 947e4e27: am 29b060fa: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours) * commit '73f7cb3d9c756fd7a03464514c505d4b812debcb': Bump revision number for all system images