| commit | 218756ecf4a380c4e4718ceaa65e20a1f6de1e6f | [log] [tgz] |
|---|---|---|
| author | Justin Koh <justinkoh@google.com> | Tue Jun 24 21:20:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 24 21:20:18 2014 +0000 |
| tree | 8f68a62c9e893b7c997db672bf5706ee907100c9 | |
| parent | ab6f8b7d39189323f7b0191b84b3f70ff05f2c5e [diff] | |
| parent | 8a291222994d767ef8d344b02d3dc2cf44655fe6 [diff] |
am 8a291222: (-s ours) am e604aad6: DO NOT MERGE Update 20.txt to match klp-mod-dev * commit '8a291222994d767ef8d344b02d3dc2cf44655fe6': DO NOT MERGE Update 20.txt to match klp-mod-dev