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