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)
commit6b0afa7eecaa2e4faff5b12218af692a363d3d53
tree7a67bb69073ca6f20c42c6a056ff5392faf59ce7
parente219163b32edea8bbde6cdf990ed5a141496c693
parent36e3fb8dafd0523538f14ced00d7c97a05398841
am 36e3fb8d: am 7a6bd46d: Merge "A couple of fixes"

* commit '36e3fb8dafd0523538f14ced00d7c97a05398841':
  A couple of fixes