OSDN Git Service

Merge \\"Allow the phone process to hide outbound text SMS\\" into nyc-mr1-dev am...
authorTa-wei Yen <twyen@google.com>
Fri, 17 Jun 2016 21:01:11 +0000 (21:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 Jun 2016 21:01:11 +0000 (21:01 +0000)
am: e5ffc4ac23

Change-Id: I65218336aa17420db78c4d03ae0aa054c96546cf


Trivial merge