tree d41279a168e4aa07265e12bff3f6ebb65cb22718
parent 14dcd775dad0918ea822aeb8d075563bea8eebd9
parent aed7823abe0a08e4ab4cf73ce3e28f4e39a03af7
author Nick Kralevich <nnk@google.com> 1439049908 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439049908 +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