Merge changes I916c680d,I55e7c86c into nyc-mr1-dev-plus-aosp

am: ba838fd7c9

Change-Id: I1e0570b493e61fdefa47bf8a089e084d10923685
This commit is contained in:
Makoto Onuki
2016-07-22 20:53:00 +00:00
committed by android-build-merger

Diff Content Not Available