OSDN Git Service

resolved conflicts for merge of f69ebaba to jb-mr1-dev-plus-aosp
authorColin Cross <ccross@android.com>
Wed, 19 Dec 2012 00:11:23 +0000 (16:11 -0800)
committerColin Cross <ccross@android.com>
Wed, 19 Dec 2012 00:11:23 +0000 (16:11 -0800)
commit828b2ca0ae745ee0c061eaed581897dac8a6fe9c
treef7049a00131c89d1a8eb8980abf9f1a4a210d302
parent066c268bb596d7188091278e92638575765e6e98
parentf69ebaba431e98a70c2151a83c4b102de89885aa
resolved conflicts for merge of f69ebaba to jb-mr1-dev-plus-aosp

Change-Id: Ia1c7025ab3d14f2d47e07acf58e161624d94c07c