OSDN Git Service

am 898b9e43: resolve conflicts w/aaf823d2
authorEd Heyl <edheyl@google.com>
Mon, 8 Dec 2014 20:28:41 +0000 (20:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 8 Dec 2014 20:28:41 +0000 (20:28 +0000)
commitd6f314cc4fe778519c86a25e95b670ec59fd6217
treeb285b5f4c014f7b002067984999afef979368d9b
parentbf401dd7f2771e1d4591da4ece931b6279d80deb
parent898b9e43cfc275acf727b748c191877349a78d98
am 898b9e43: resolve conflicts w/aaf823d2

* commit '898b9e43cfc275acf727b748c191877349a78d98':
  Fix issue #18368417: 5.0 -> 5.1.