tree 1263880e07d83b9b9870de6a932723816b48af7d
parent c78d648c230153c1ed6a52fb17a0f2ca594a86e6
parent 367ec61c1c252ca034f870edbdb62305b11a1ba1
author ztenghui <ztenghui@google.com> 1380731809 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380731809 -0700

am 367ec61c: Replace the ACTION_GET_CONTENT with ACTION_PICK

* commit '367ec61c1c252ca034f870edbdb62305b11a1ba1':
  Replace the ACTION_GET_CONTENT with ACTION_PICK