OSDN Git Service

am a60406f5: am e70609c8: am 5cb18054: am e115755d: Merge "remove erroneous file...
authorRobert Ly <robertly@google.com>
Tue, 10 Jun 2014 01:30:11 +0000 (01:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 10 Jun 2014 01:30:11 +0000 (01:30 +0000)
* commit 'a60406f5465208079c14770defcfcced10432481':
  remove erroneous file


Trivial merge