tree 405bb1fab8e97e7fa1d520b039dfa4373d3fc7ed
parent f270a1521c39bb6f47ebd29c1a14d9a33f14d87f
parent f6576d9631f9c5a393c20d5cefc79fb150119e06
author Jason Sams <rjsams@android.com> 1317841311 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1317841311 -0700

Merge "Wrapping new API with #defines to prevent old apps from using them."