| commit | 105e6e0c38947e97f9e199d9f07f9be64ae3cfe1 | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Fri Dec 12 01:08:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 12 01:08:20 2014 +0000 |
| tree | 09df304495199fc253b97d1db9ba5acc809e4fb1 | |
| parent | 2590fc421ccf5e8199d511ff3022b428ee9122e9 [diff] | |
| parent | 7b2b26750fb0a567f2d1b7a3547ae877d336e405 [diff] |
am 7b2b2675: am 67c93ad7: am f1b12df3: Merge "Trigger error only when a template is instantiated." * commit '7b2b26750fb0a567f2d1b7a3547ae877d336e405': Trigger error only when a template is instantiated.