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

Browse Source

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

...

This commit is contained in:

Nick Kralevich

2015-08-08 16:05:08 +00:00

committed by Android Git Automerger

parent 14dcd775da aed7823abe

commit 29b060fa81

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available