OSDN Git Service

am 36e3fb8d: am 7a6bd46d: Merge "A couple of fixes"
authorNarayan Kamath <narayan@google.com>
Fri, 7 Mar 2014 16:14:24 +0000 (16:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 Mar 2014 16:14:24 +0000 (16:14 +0000)
* commit '36e3fb8dafd0523538f14ced00d7c97a05398841':
  A couple of fixes


Trivial merge