Merge "Cherry-pick the following missing commits from nyc-mr1-dev prior to b/33090058...
authorXin Li <delphij@google.com>
Wed, 28 Dec 2016 21:03:12 +0000 (21:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 28 Dec 2016 21:03:12 +0000 (21:03 +0000)
commit2533d1e0950ab43893878f2d6c614010f8d1ad0b
tree6210e36dd0769b937c947fd5d9ebd2646a7f2386
parentdbf8a43c5d21626489482a588ffe69b41d3204d6
parent231078fb463f687ebaf95d3f01683e685110bca0
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
am: 231078fb46

Change-Id: Ic5b5d8489dc77013b48e04779671066ae3576328