OSDN Git Service

resolved conflicts for merge of ad209a93 to klp-dev-plus-aosp
authorDirk Dougherty <ddougherty@google.com>
Tue, 5 Nov 2013 03:02:52 +0000 (19:02 -0800)
committerDirk Dougherty <ddougherty@google.com>
Tue, 5 Nov 2013 03:06:04 +0000 (19:06 -0800)
commit56e6fc57387e6b8ff39c0744cf4ee4dd089ae3f1
tree28a4640f63065973c4d0322969870f66ac21e487
parentc3ce4221663f4d8ed740642f5342aa4ad757f225
parentad209a9385cee1ca212651e02ec649c44d7de06e
resolved conflicts for merge of ad209a93 to klp-dev-plus-aosp

Change-Id: Ie7549ffc91c167660f8062f5084eaae28a8ea7d1