OSDN Git Service

am 791eac86: am 19eadcab: am 2b26e8dc: Merge "Un-@hide some missed video APIs." into...
authorTyler Gunn <tgunn@google.com>
Mon, 1 Jun 2015 15:46:54 +0000 (15:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 15:46:54 +0000 (15:46 +0000)
* commit '791eac86138e0f8d04c7c507e7410c40114308a1':
  Un-@hide some missed video APIs.

1  2 
api/current.txt
api/system-current.txt

diff --cc api/current.txt
Simple merge
Simple merge