| commit | 37684bb0653e2e93fb70fb4481799db485a90db1 | [log] [tgz] |
|---|---|---|
| author | Raphael Moll <raphael@google.com> | Thu Oct 10 22:18:19 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Oct 10 22:18:20 2013 +0000 |
| tree | 85e0c68f63761ec670a2536f4b7a3129b22d7923 | |
| parent | bc9875e27cbc042dc1388b94b1d20a1b46f21fc2 [diff] | |
| parent | 161314c80ba7aab8179b2c51ebc89fdd6f597557 [diff] |
Merge "resolved conflicts for merge of 14794b20 to klp-dev" into klp-dev