OSDN Git Service

resolved conflicts for merge of 78866b71 to jb-dev
authorScott Main <smain@google.com>
Thu, 4 Oct 2012 18:39:00 +0000 (11:39 -0700)
committerScott Main <smain@google.com>
Thu, 4 Oct 2012 18:39:00 +0000 (11:39 -0700)
commitbc7a20a48c3e8405c8dbbf54dd8f422fa5e19e3a
tree9fc36ca605b2e409cc04622ef457f3028a5330a1
parent6b962174bf974edd5298a37498777780e0b7b1fe
parent78866b71e6c10f8c63f5e333cf9c083d342799a0
resolved conflicts for merge of 78866b71 to jb-dev

Change-Id: I028637f4622f398769ad43e714d45ec95ff3f23d