commit | 29b060fa81f3f7b9133805b6242c11c68dbcbc39 | [log] [tgz] |
---|---|---|
author | Nick Kralevich <nnk@google.com> | Sat Aug 08 16:05:08 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 08 16:05:08 2015 +0000 |
tree | d41279a168e4aa07265e12bff3f6ebb65cb22718 | |
parent | 14dcd775dad0918ea822aeb8d075563bea8eebd9 [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