OSDN Git Service

resolved conflicts for merge of 2321482e to jb-mr2-dev-plus-aosp
authorYing Wang <wangying@google.com>
Sat, 6 Apr 2013 04:04:23 +0000 (21:04 -0700)
committerYing Wang <wangying@google.com>
Sat, 6 Apr 2013 04:04:23 +0000 (21:04 -0700)
commite63604e3a8b6114067bb1604797a04ae84ca7cc5
tree084b01d3c8f9453142ed06c3d81f0ed84c924793
parent31e588e4e1f7fa4223d01999150c7e2a71c797ac
parent2321482e04edfbd3a8eeab1c8b3b32e53067c564
resolved conflicts for merge of 2321482e to jb-mr2-dev-plus-aosp

Change-Id: I1b144cdf6774df95c0507cc5751d7def240cf645