tree ae87781b25cacf61c784d1881e421c9ed8c007b2
parent d96544ff69601fe2990245e10e054480f0bd341f
parent 053b865412d1982ad1dc0e840898d82527deeb99
author Jeff Brown <jeffbrown@google.com> 1339194421 -0700
committer Jeff Brown <jeffbrown@google.com> 1339194421 -0700

resolved conflicts for merge of 053b8654 to jb-dev-plus-aosp

Change-Id: Idfef8c26b7a9e1a1a202e21dc5d34022bbaa92cc