tree ffff6872edc3069b28d11e6ae44b6899ee739409
parent 36b8e5d42e05e04299b0e218bc6e23bddd0feb42
parent 635d8a06fe9f0fe837eeb36e833a18d36967c338
author Trevor Johns <trevorjohns@google.com> 1383170993 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1383170993 -0700

am 635d8a06: Merge "Revert "Merge downstream branch \'developers-dev\' into \'klp-dev\'"" into klp-dev

* commit '635d8a06fe9f0fe837eeb36e833a18d36967c338':
  Revert "Merge downstream branch 'developers-dev' into 'klp-dev'"