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

Browse Source

* commit 'fdcb8bbb86fb4aca2d2e4fc923e3c9172d24dcb0':

...

This commit is contained in:

Nick Kralevich

2015-08-08 16:10:18 +00:00

committed by Android Git Automerger

parent 27ac85b18c fdcb8bbb86

commit 8d3096352c

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