OSDN Git Service

am a8c64209: am 70071d7b: am 16652433: make basic editor based on ParametricEditor
authorJohn Hoford <hoford@google.com>
Tue, 9 Apr 2013 03:13:51 +0000 (20:13 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 9 Apr 2013 03:13:51 +0000 (20:13 -0700)
* commit 'a8c642098aea0edb6af0ecbaf23fc5a768773cbf':
  make basic editor based on ParametricEditor


Trivial merge