commit | 5e5f2ab38aac14351717f226e883d6b7ff62aebc | [log] [tgz] |
---|---|---|
author | Nick Kralevich <nnk@google.com> | Sat Aug 08 17:23:03 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 08 17:23:03 2015 +0000 |
tree | 597ae5de646e9732c0950c4d41cfd726e4c61c75 | |
parent | 7f3cb054fdcd3a25ec522ab068975ef56ac7eece [diff] | |
parent | 1ea2e463a3edef81ff2a4d166eadd826dc0b3bdd [diff] |
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 '1ea2e463a3edef81ff2a4d166eadd826dc0b3bdd': Bump revision number for all system images