OSDN Git Service

am 6474d840: am 636af7a1: Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into...
authorJeff Brown <jeffbrown@google.com>
Fri, 31 May 2013 01:02:31 +0000 (18:02 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 31 May 2013 01:02:31 +0000 (18:02 -0700)
commit718aefb6ff11d16ce7412c81e4d4d9c29124eead
tree009fc0852e115279a2f63965c0367a547eb4964b
parentc1e0ca9fee17cb56a992ae107d3b1aa534290b2d
parent6474d8407cb1551608fc403861e11cf514f8558e
am 6474d840: am 636af7a1: Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr2-dev

* commit '6474d8407cb1551608fc403861e11cf514f8558e':
  Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity.
api/current.txt
media/java/android/media/MediaRouter.java