commit | fe4e47602ce6f79a816f6be5f47692ed1d49bc61 | [log] [tgz] |
---|---|---|
author | Robert Ly <robertly@google.com> | Sun Jun 29 03:24:37 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jun 29 03:24:37 2014 +0000 |
tree | eca18be980932445b58159f19ebcb189a6417251 | |
parent | 1ab96f29b60fa8982fddf5a6d33c5ed1d104398a [diff] | |
parent | 49ba77b441d0dc32c2423cf635e81dc31514d2a8 [diff] |
am 49ba77b4: am 4c42ab4b: (-s ours) Merge "Revert "Add api 20 to list used by reference docs."" into klp-modular-dev * commit '49ba77b441d0dc32c2423cf635e81dc31514d2a8': Revert "Add api 20 to list used by reference docs."