tree 14a266199ef55d419b7f5da4f5013934bac8a2ba
parent b5edb0bd60939f8899fc4bec30f9b7a851775443
parent d40f43c1256da5fc27beb0000b56f38e65c380c4
author Martijn Coenen <maco@google.com> 1375829208 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1375829208 +0000

Merge "NFC: @hide some APIs, add setDefaultForNextTap API."