OSDN Git Service

resolved conflicts for merge of c1244a29 to mnc-dr-dev
authorAdrian Roos <roosa@google.com>
Wed, 22 Jul 2015 19:00:50 +0000 (12:00 -0700)
committerAdrian Roos <roosa@google.com>
Wed, 22 Jul 2015 19:00:56 +0000 (12:00 -0700)
commitb30f841cb44e132598939b0797dad41f6c0004a7
tree764ce0e064d7d786ab93072493299999bc307386
parentc41e3191654d1b1e9df641da6aa7a8bf4f64b975
parentc1244a2995087c930842b7d5e5a35a446c5c40f7
resolved conflicts for merge of c1244a29 to mnc-dr-dev

Change-Id: I8b3e3a21e36ac5085bf1dffa90e49dabd17dd139