commit | 8314da1c62d6a19d9e44bb9c32db00c0af02676b | [log] [tgz] |
---|---|---|
author | Nick Kralevich <nnk@google.com> | Sat Aug 08 16:50:35 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 08 16:50:35 2015 +0000 |
tree | 53965f67a6cc18d721f688c14b9a3c08e8736995 | |
parent | 73e98d2720a8fadb952c1cd7c374b5927ef28e83 [diff] | |
parent | 3728b128dded4501c70e509a1de0a0072ede6c1a [diff] |
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 '3728b128dded4501c70e509a1de0a0072ede6c1a': Bump revision number for all system images