tree c7a08b9e15f8f74be0964b494149de6d62bb03ce
parent b7a4aed94eb02731057fdf78eb7bafc8ececadc9
parent b861a9455ce8018b859d8b670e58324d79d9fd3a
author Scott Main <smain@google.com> 1360722605 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360722605 -0800

am b861a945: am 4cb43d97: Merge "lists.js files for gms and gcm" into jb-mr1-dev

# By Robert Ly
# Via Android (Google) Code Review (1) and others
* commit 'b861a9455ce8018b859d8b670e58324d79d9fd3a':
  lists.js files for gms and gcm