commit | 497bcc4d87f29b151b6f4b8e4141cc6888138749 | [log] [tgz] |
---|---|---|
author | Nick Kralevich <nnk@google.com> | Sat Aug 08 17:27:35 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 08 17:27:35 2015 +0000 |
tree | b6e50972eba1887977fdcfa0a665469e9a359df9 | |
parent | 8484c46a1ed2382ed634f4c46c9fa0f3bf982384 [diff] | |
parent | 5e5f2ab38aac14351717f226e883d6b7ff62aebc [diff] |
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 '5e5f2ab38aac14351717f226e883d6b7ff62aebc': Bump revision number for all system images