tree 27c919fddab0a364276ee157ff3f0e8bc6fc7f2e
parent d1411efee372a37fcd0178f3ccffd9bf1d67b70b
parent a920f25fe55fc9afc7640902a200f19ce278588b
author Elliott Hughes <enh@google.com> 1372463413 -0700
committer Elliott Hughes <enh@google.com> 1372463413 -0700

resolved conflicts for merge of a920f25f to jb-mr2-dev-plus-aosp

Change-Id: I3349f8d2e6715171e2677c1385122ceb2810c1f6