commit | 9e76668030d14f7377d66c590d182a05b954ede7 | [log] [tgz] |
---|---|---|
author | Ed Heyl <edheyl@google.com> | Tue Oct 08 15:45:43 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 08 15:45:43 2013 -0700 |
tree | 30cd8f86e2ce3411eedf944d46cf73d15a5b4d1d | |
parent | ad1de80608e16f3b40a947ca76889ed8f076527a [diff] | |
parent | 1d0f35a489fe6ea314ac9f2f2ca21b6507b41554 [diff] |
am 1d0f35a4: merge in KQS81M * commit '1d0f35a489fe6ea314ac9f2f2ca21b6507b41554':