commit | e1baec5d7cb208a18b30279554dcc3233b79a78b | [log] [tgz] |
---|---|---|
author | Nick Kralevich <nnk@google.com> | Sat Aug 08 16:22:01 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 08 16:22:01 2015 +0000 |
tree | 110ab28acc4976aa8ad873687207793bc145630e | |
parent | ae1dae196373c6a56eb107a8114e1711da77de57 [diff] | |
parent | 4393aeff0e438faa1f36241d87a128a697065663 [diff] |
am 4393aeff: am 947e4e27: am 29b060fa: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours) * commit '4393aeff0e438faa1f36241d87a128a697065663': Bump revision number for all system images