am 5b3b2193: (-s ours) am 88aa40df: am b4ef2aba: am f2a8aa34: am fdcade18: am ff246059: am 5fc6ca11: am d7138ba4: am 6ab0f7a9: am e8566ffb: am c0b3754c: am 98970843: am 4dec9d0d: am d2bd9baf: am 8d309635: am fdcb8bbb: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1

Browse Source

* commit '5b3b21932b81ac7316636db2fb3302140ccfe21a':

...

This commit is contained in:

Nick Kralevich

2015-08-27 10:48:36 +00:00

committed by Android Git Automerger

parent 0fcc012370 5b3b21932b

commit 7da6fbcb9a

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