| commit | fb23e590e3f17e68cf04eac9c86c066956ff723d | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Thu Aug 27 23:50:05 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 23:50:05 2015 +0000 |
| tree | 85c8017324e2357c479e01bef23304dc922aafed | |
| parent | bc92ab1522c17bebf00a9e95076a1cd097db9896 [diff] | |
| parent | 18db4f5f8f75006eb9d3f1091e5f24b9066b2bf8 [diff] |
am 18db4f5f: (-s ours) am dfcd35d7: am e4b4b084: (-s ours) am eb15670c: am 92f373fe: Fix Matrix_Delegate.native_getValues() [DO NOT MERGE] * commit '18db4f5f8f75006eb9d3f1091e5f24b9066b2bf8':