tree 265539d9202f5c0aca2d281dc82b7d346eb6e8d3
parent ea641208a07ce4df1330934547b946a50bc74cc4
parent a63816c1bb4e9dc93df3fe498eca74cde1f45bc3
author Christopher Tate <ctate@google.com> 1380230300 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380230300 -0700

am a63816c1: am 4e9c7d8b: Merge "Sigh." into klp-dev

* commit 'a63816c1bb4e9dc93df3fe498eca74cde1f45bc3':
  Sigh.