tree f7049a00131c89d1a8eb8980abf9f1a4a210d302
parent 066c268bb596d7188091278e92638575765e6e98
parent f69ebaba431e98a70c2151a83c4b102de89885aa
author Colin Cross <ccross@android.com> 1355875883 -0800
committer Colin Cross <ccross@android.com> 1355875883 -0800

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

Change-Id: Ia1c7025ab3d14f2d47e07acf58e161624d94c07c