OSDN Git Service

am db0dca82: resolved conflicts for merge of c1edfc2c to master
authorGabriel Peal <gpeal@google.com>
Tue, 25 Mar 2014 20:46:13 +0000 (13:46 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 25 Mar 2014 20:46:13 +0000 (13:46 -0700)
commit9938854e71b35efbf2d2cf25e16b160e4bf2b15b
tree58db498de90b3953b0f904d38e84917a8de0bb67
parentfb48c1c722f1eff661a1f5e37cebb856b3e952cf
parentdb0dca826d992af1adfa53e10c31f08d3197bb0b
am db0dca82: resolved conflicts for merge of c1edfc2c to master

* commit 'db0dca826d992af1adfa53e10c31f08d3197bb0b':
  resolved conflicts for merge of c1edfc2c to master