tree ce6bbff3f603a030ff6d159f268055f008b6d6fb
parent 4ec69e8d26a1149a5844f6ca4721aea73edd8346
parent 4b27762cfe6c2115a538ed65205d7531155f01ce
author Elliott Hughes <enh@google.com> 1366074366 -0700
committer Elliott Hughes <enh@google.com> 1366074366 -0700

resolved conflicts for merge of 4b27762c to jb-mr1-dev-plus-aosp

Change-Id: Ie3e622667fb2300cfb8b1927767dc6402970bf9e