tree ea9edc7539e6d0e7ce9515efa57a73a6e93e63e7
parent 2848f760f5a05450f8ddcd619e2c35c6f9ac5ca3
parent dfce0af5f603f172e265419facb14d517ec2cd62
author Elliott Hughes <enh@google.com> 1465274443 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1465274443 +0000

Merge "resolve merge conflicts of a6d5661 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp