OSDN Git Service

am e16a21c6: resolved conflicts for merge of 4a59376d to stage-aosp-master
authorElliott Hughes <enh@google.com>
Tue, 9 Jul 2013 22:28:51 +0000 (15:28 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 9 Jul 2013 22:28:51 +0000 (15:28 -0700)
commitdff4ec87e7b942b7b4410f639fc74c2cffb386d6
tree0170831ebee5c0b5fba1f6ddfce0d0cd8f1d5a13
parent4d380d71e06781314b052ea71ef20ed6511e560f
parente16a21c6b4f108813e5f5e00f30e0ff075de504c
am e16a21c6: resolved conflicts for merge of 4a59376d to stage-aosp-master

* commit 'e16a21c6b4f108813e5f5e00f30e0ff075de504c':
  Track libcore API change.