| commit | f4748e79ccdc8c6f10a5903791cd253bc084a6ef | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Tue Apr 29 15:30:09 2014 -0700 |
| committer | Bill Yi <byi@google.com> | Tue Apr 29 15:30:09 2014 -0700 |
| tree | 2dbb05e45f4a5eea661a6eeacb03f28c85efb5db | |
| parent | a3170fa2e80cd35d1677930d667d518d5d258c7a [diff] | |
| parent | 7d4e2d70d7d9f2c53d61fb334079261c73133e01 [diff] |
Merge klp-dev-plus-aosp into stage-aosp-master Change-Id: I9f294587991055d15c369b3c1c4e23663ce35b9a