Merge "Cherry-pick the following missing commits from nyc-mr1-dev prior to b/33090058...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Wed, 28 Dec 2016 20:57:01 +0000 (20:57 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 28 Dec 2016 20:57:01 +0000 (20:57 +0000)
commit231078fb463f687ebaf95d3f01683e685110bca0
tree44d34133bc3a46231a9580b071851c69ca1e4a63
parent2c3475cb3a961c6ced38f563ce586fc76f07962d
parented086fd003251af2a4918e920ba4ea15f83a9e22
Merge "Cherry-pick the following missing commits from nyc-mr1-dev prior to b/33090058, which was lost as a result of merge 01c922fc267ea41cc1c6cb83cde7ba6da200dc38: am: 77f62518ec am: 3d11686e0e am: 3d0f2fb381" into nyc-mr2-dev-plus-aosp