OSDN Git Service

Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1...
authorXin Li <delphij@google.com>
Fri, 11 Nov 2016 00:12:50 +0000 (00:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 Nov 2016 00:12:50 +0000 (00:12 +0000)
commit921dd6a5fde634cb4f37aba53d6d887064a1298f
tree0da7a0de0309125af68ea92e313e479588bdaa66
parent77decadefe91730c68d1780c21c3d20e3c74144e
parent6ec8dd10bb902855f72975b9ec07e17dfdcebaa8
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev. am: 7e0483fcec  -s ours am: 16090c6177  -s ours am: 0a568ae56e am: 9788dd5bd2
am: 6ec8dd10bb

Change-Id: Ied2074dc34507fcb0dcfca6d68c8780f00dd0bc0