OSDN Git Service

resolved conflicts for merge of d1aed628 to honeycomb-plus-aosp
authorBrian Carlstrom <bdc@google.com>
Tue, 3 May 2011 22:11:19 +0000 (15:11 -0700)
committerBrian Carlstrom <bdc@google.com>
Tue, 3 May 2011 22:11:19 +0000 (15:11 -0700)
commit38bfbace16fa8dc7e69761e1f29586d0ef5ea90c
tree95a25954543ad6ed68d4e273871ef8f741c59ed5
parent1eef3e2f220e264984e1c9a94f3782a1350a3ff9
parentd1aed628997033076580580db381eaee0a3d29df
resolved conflicts for merge of d1aed628 to honeycomb-plus-aosp

Change-Id: I6a1ffad61d29c6d361272bdd55522f4bd5f0e2c5