tree 68439bf7652922e57e5cf85c0dafb7beed71b346
parent 58668fc5a502e159d1daf79540ee9039153a2697
parent 1fd1d233d3de26873e08f78e16ed6be41d969369
author Griff Hazen <griff@google.com> 1406073799 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1406073799 +0000

am 1fd1d233: (-s ours) am 7003893f: DO NOT MERGE Update version of sdk 20 samples to 2

* commit '1fd1d233d3de26873e08f78e16ed6be41d969369':
  DO NOT MERGE Update version of sdk 20 samples to 2