OSDN Git Service

am 597a8ec8: am 6075170b: Changes corresponding to framework changes.
authorDharmesh Mokani <mokani@google.com>
Sat, 31 Jan 2015 01:07:23 +0000 (01:07 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 31 Jan 2015 01:07:23 +0000 (01:07 +0000)
* commit '597a8ec85ce6dab28e110f63bbd44b270675304b':


Trivial merge