| commit | 628877cc073076a7d93e3d937151c15e1c54ffae | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Sat Aug 08 17:40:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 08 17:40:35 2015 +0000 |
| tree | b35e813d1c2c4a6a41d483fcb3287ecf43d6018a | |
| parent | 268ca6d58c3f1710e5ace55faea05b4130a41293 [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