OSDN Git Service

Merge changes I5c32ab58,Ie480f9d6 am: 5a0706d429
authorRoshan Pius <rpius@google.com>
Fri, 3 Mar 2017 20:52:34 +0000 (20:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Mar 2017 20:52:34 +0000 (20:52 +0000)
commit2567e401e6200fda519ac2ddcf3a411cd2e4c416
tree3f9a9bce59ee082d1ea6c52952730bc7ae0b6a63
parenta25c53a2a4e5fb4ecf807e451382ac8f693a99d0
parent857fb76af1c3146717a2867d4846c40127e83c78
Merge changes I5c32ab58,Ie480f9d6 am: 5a0706d429
am: 857fb76af1

Change-Id: Ie8acf90170a48239ab7e21175606f6091199db4a