| commit | 7b2b26750fb0a567f2d1b7a3547ae877d336e405 | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Fri Dec 12 01:01:25 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 12 01:01:25 2014 +0000 |
| tree | 3a17783e9f464311eb3167cd33e62666ab9d4963 | |
| parent | 3e08ca6709b5a75dc3b779cf3eba8196b08a0245 [diff] | |
| parent | 67c93ad704d4418445c6d9693420f1cbaad98b0a [diff] |
am 67c93ad7: am f1b12df3: Merge "Trigger error only when a template is instantiated." * commit '67c93ad704d4418445c6d9693420f1cbaad98b0a': Trigger error only when a template is instantiated.