OSDN Git Service

am 63ac58e7: am 1c01afc0: Merge "AudioAttributes: unhide CREATOR" into lmp-dev
authorJean-Michel Trivi <jmtrivi@google.com>
Mon, 15 Sep 2014 21:17:59 +0000 (21:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 15 Sep 2014 21:17:59 +0000 (21:17 +0000)
* commit '63ac58e7488c36d96dad5eba6367ae6845fd1c19':


Trivial merge