| commit | 63c3068ac343cec183bff4afd5fd05dbbf3ccede | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Sat Aug 08 16:57:06 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 08 16:57:06 2015 +0000 |
| tree | a0c0b139f076bf3ffc92182d38ee4f8e3dd62c30 | |
| parent | 2032317a796cd9d2a32e23e75a4c34444d217ad6 [diff] | |
| parent | 8314da1c62d6a19d9e44bb9c32db00c0af02676b [diff] |
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 '8314da1c62d6a19d9e44bb9c32db00c0af02676b': Bump revision number for all system images