diff options
| author | Qiwen Zhao <zhao@google.com> | 2013-12-10 18:47:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-10 18:47:19 +0000 |
| commit | a3d0c71a8866c5bb236c96b80f4de0e023680309 (patch) | |
| tree | 6213688f5e143d15dc1f9718fcb11dcae93ce20b /res | |
| parent | 1b638298bc7f84c915b479c3c29b9f0c99811bf3 (diff) | |
| parent | 6818b9cb60a0a2b1414537999ff095fafd820e56 (diff) | |
am 6818b9cb: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev
* commit '6818b9cb60a0a2b1414537999ff095fafd820e56':
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions