diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-10-26 22:47:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-26 22:47:40 +0000 |
| commit | f6cba431efa5b921e650dcbf661d3313e96d214b (patch) | |
| tree | 0f4e8d7156f678f34a0e28cb6cdb3ac35887792e | |
| parent | 141649b66453380a4a912f72ec765f2c1877f3e0 (diff) | |
| parent | 57cc16e38e6461da4317c285eec61c3265e516bf (diff) | |
| download | jpeg-f6cba431efa5b921e650dcbf661d3313e96d214b.tar.gz | |
am 57cc16e3: am a66efb5d: Merge "Add -no-integrated-as at local level."
* commit '57cc16e38e6461da4317c285eec61c3265e516bf':
0 files changed, 0 insertions, 0 deletions