| commit | 947e4e275e13e76358d4def4f6b5dc5959a5e79a | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Sat Aug 08 16:12:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 08 16:12:10 2015 +0000 |
| tree | 53e55fd0e2d8080c2505f388db1727f8bdb10578 | |
| parent | 4ef13a69549dc633c0f617ec7159d0f0ada49a08 [diff] | |
| parent | 29b060fa81f3f7b9133805b6242c11c68dbcbc39 [diff] |
am 29b060fa: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours) * commit '29b060fa81f3f7b9133805b6242c11c68dbcbc39': Bump revision number for all system images