Merge changes from topic 'am-afbe65226c664d438460b33cb5a405a8' into nyc-mr1-dev
authorKalle Raita <kraita@google.com>
Sat, 21 Jan 2017 00:35:00 +0000 (00:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 21 Jan 2017 00:35:00 +0000 (00:35 +0000)
commit30d7647d1a32a2e4b341bbaea1820661901c84bc
treed7bdc92a60c5eea8493ceaa728aadfd31ac091cb
parentd027dbfab77f4b6fa0cf1025a5e37ea2fb916f10
parent59cabbec6496d7fe37a9f9bea042c6cdcf62e47a
Merge changes from topic 'am-afbe65226c664d438460b33cb5a405a8' into nyc-mr1-dev
am: 59cabbec64

Change-Id: I4fc12577f16110122dcd4d2c5abaff4403835380