Merge changes I5a1e9d04,Ic6f20e06 into nyc-mr1-dev-plus-aosp

am: 1549c28f8d

Change-Id: I56bdf032da222f773c6255de2166db884ed724ce
This commit is contained in:
Jorim Jaggi
2016-07-25 22:58:28 +00:00
committed by android-build-merger

Diff Content Not Available