| commit | be103ec8c72908ba5bb2a76806f03a825878e353 | [log] [tgz] |
|---|---|---|
| author | Ching Tzung Lin <ctlin@google.com> | Thu Jul 23 23:24:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 23 23:24:44 2015 +0000 |
| tree | 2f55576cad3bfd99a20090c2aaf2b4b857ad3b70 | |
| parent | a6ab97371cdf0361c7ec4c799841e4b8e3eb50cd [diff] | |
| parent | d4884e2f3c138a7cc881bb1fb34b672a1c9db595 [diff] |
am d4884e2f: Merge "Fix compilation error on emerald-dev" into cw-e-dev * commit 'd4884e2f3c138a7cc881bb1fb34b672a1c9db595': Fix compilation error on emerald-dev