commit | 3728b128dded4501c70e509a1de0a0072ede6c1a | [log] [tgz] |
---|---|---|
author | Nick Kralevich <nnk@google.com> | Sat Aug 08 16:40:51 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 08 16:40:51 2015 +0000 |
tree | 0835c96c5482a13d4981ae589798a4e25e16df7d | |
parent | 0878662fcd3526597c331791dfefc033790b4551 [diff] | |
parent | 97af61da9ccf2a1482921a814faa2e374c3a6535 [diff] |
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 '97af61da9ccf2a1482921a814faa2e374c3a6535': Bump revision number for all system images