tree 4cf6d204c3ee547253ac9b3bfbbd8fdd8463696b
parent 831fe19440eab08f361538f427af6d8b4cd88ff6
parent c7b59612760ed962fc59ef5bdd47775305e131c6
author Android Build Merger (Role) <android-build-merger@google.com> 1464833580 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1464833580 +0000

Merge "Merge changes Ie3033144,Ib4008117 into nyc-dev am: 6fae62de61 am: 83afcd2072" into nyc-mr1-dev-plus-aosp