OSDN Git Service

am ccec5f0d: resolved conflicts for merge of 02e85744 to master
authorElliott Hughes <enh@google.com>
Fri, 25 Apr 2014 16:08:43 +0000 (16:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 25 Apr 2014 16:08:43 +0000 (16:08 +0000)
commit6a885ba4a01938e9f836ec04f861025ab49abb9b
tree0be147b0de7145d6d81d2eb574299e8dc754b351
parent8e5933dbc4cb9837989da74ed1ac16f7d19c7e28
parentccec5f0def723baa6c4c80bd7ff1971a32c9d8c3
am ccec5f0d: resolved conflicts for merge of 02e85744 to master

* commit 'ccec5f0def723baa6c4c80bd7ff1971a32c9d8c3':
  Use the suggested public API instead of libcore.os.