OSDN Git Service

resolved conflicts for merge of 3a271718 to jb-mr2-dev-plus-aosp
authorKenny Root <kroot@google.com>
Mon, 8 Apr 2013 19:06:29 +0000 (12:06 -0700)
committerKenny Root <kroot@google.com>
Mon, 8 Apr 2013 19:06:29 +0000 (12:06 -0700)
commitd1e485a8fc84e4aa279fcaf482fa2247b365574a
treedc1168408862d7f2c2c12e663add8266e06c80a9
parent56e75f3c170f859ecd05b43ca5e3a14ac7878cf7
parent3a271718815062c5b904f157a7be9008320a7c37
resolved conflicts for merge of 3a271718 to jb-mr2-dev-plus-aosp

Change-Id: If405c0e3ccff4029c2b54cf557d09c086485ab20