summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Ly <robertly@google.com>2014-06-28 02:32:19 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-28 02:32:19 +0000
commit49ba77b441d0dc32c2423cf635e81dc31514d2a8 (patch)
treef76ab951578cd43ae529b4cab121d54db377e1df
parent684abbb448444cb2e50a547073e2a70de036c579 (diff)
parent4c42ab4ba59d75eca4883ece2944c30ca36b760f (diff)
downloadframeworks_base-49ba77b441d0dc32c2423cf635e81dc31514d2a8.zip
frameworks_base-49ba77b441d0dc32c2423cf635e81dc31514d2a8.tar.gz
frameworks_base-49ba77b441d0dc32c2423cf635e81dc31514d2a8.tar.bz2
am 4c42ab4b: (-s ours) Merge "Revert "Add api 20 to list used by reference docs."" into klp-modular-dev
* commit '4c42ab4ba59d75eca4883ece2944c30ca36b760f': Revert "Add api 20 to list used by reference docs."
0 files changed, 0 insertions, 0 deletions