Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev." into lmp-mr1-dev am: 78f15948fb am: 34de2a2d45 -s ours am: a5c82e7dd9 am: ca2abc5b71 am: ae5db8a6dc

Browse Source

am: db984f917c  -s ours

Change-Id: Ib1df6a08c3f6a2e379f7d4ffac944c2169336f11

...

This commit is contained in:

Xin Li

2016-11-14 12:56:36 +00:00

committed by android-build-merger

parent 05a61276c6 db984f917c

commit ee6b51a05b

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