commit | fdcb8bbb86fb4aca2d2e4fc923e3c9172d24dcb0 | [log] [tgz] |
---|---|---|
author | Nick Kralevich <nnk@google.com> | Sat Aug 08 16:04:27 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 08 16:04:27 2015 +0000 |
tree | 4885593e668afb3029ae97d0974b2f0dbd64f77f | |
parent | 40d02c8fba29f7b49bbd9f2b330b83948f3e9bbb [diff] | |
parent | aed7823abe0a08e4ab4cf73ce3e28f4e39a03af7 [diff] |
am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours) * commit 'aed7823abe0a08e4ab4cf73ce3e28f4e39a03af7': Bump revision number for all system images