OSDN Git Service

resolved conflicts for merge of f90628c6 to mnc-dr-dev
authorMaurice Lam <yukl@google.com>
Wed, 15 Jul 2015 21:57:06 +0000 (14:57 -0700)
committerMaurice Lam <yukl@google.com>
Wed, 15 Jul 2015 21:57:06 +0000 (14:57 -0700)
commite63322f640cf955ba296e064b07e4920d334f851
tree5999aad92fa346ccb7dbfd24355ff691ad9c42ec
parentb6cb215cbefc803b0a1510a7f7c606d4d5c10045
parentf90628c6ec8cf80b44b9559db448eb9537b41fdc
resolved conflicts for merge of f90628c6 to mnc-dr-dev

Change-Id: I3b0729b1d00a4ca25d3a7127e27b4fc3a062d30d