OSDN Git Service

am 2b878f60: am a6043f76: support differently named lists.js files
authorRobert Ly <robertly@google.com>
Wed, 20 Feb 2013 23:22:22 +0000 (15:22 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 20 Feb 2013 23:22:22 +0000 (15:22 -0800)
* commit '2b878f60c9e668b8a31d58ac8c89307b5b4faa45':
  support differently named lists.js files


Trivial merge