tree 4885593e668afb3029ae97d0974b2f0dbd64f77f
parent 40d02c8fba29f7b49bbd9f2b330b83948f3e9bbb
parent aed7823abe0a08e4ab4cf73ce3e28f4e39a03af7
author Nick Kralevich <nnk@google.com> 1439049867 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439049867 +0000

am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours)

* commit 'aed7823abe0a08e4ab4cf73ce3e28f4e39a03af7':
  Bump revision number for all system images