OSDN Git Service

resolved conflicts for merge of 917e120f to jb-mr1-dev-plus-aosp
authorColin Cross <ccross@android.com>
Wed, 19 Dec 2012 06:50:50 +0000 (22:50 -0800)
committerColin Cross <ccross@android.com>
Wed, 19 Dec 2012 06:50:50 +0000 (22:50 -0800)
commitc9c4c77f368938af19270da5ce24d0b8a94ece77
treef7049a00131c89d1a8eb8980abf9f1a4a210d302
parent828b2ca0ae745ee0c061eaed581897dac8a6fe9c
parent917e120f736f95292a40b6c7da9940d6369955e1
resolved conflicts for merge of 917e120f to jb-mr1-dev-plus-aosp

Change-Id: I5f3176d4f4859e7cf70899173f28944fc3a678b4