| commit | 9731f5796c40dd366121b543d08217c5d3a63b36 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Thu Jan 30 02:47:16 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jan 30 02:47:17 2014 +0000 |
| tree | 2aa9e37766dff8e0900703c04346edc851c3bfee | |
| parent | 268d7ad32995b3c4a9dfe4981878946db6d29ef4 [diff] | |
| parent | bd28e2d9d3c2a7e80babd39471d5788843a48d4a [diff] |
Merge "Manual merge of changes from klp-dev"