| commit | d6fb6247be0a9276f7b9875009c5ade645e446ce | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Tue Apr 29 15:28:59 2014 -0700 |
| committer | Bill Yi <byi@google.com> | Tue Apr 29 15:28:59 2014 -0700 |
| tree | b763c4f180d4d1de05d990d09df5871afdf22e36 | |
| parent | ca3ca573c82df1114f15224929590df8eabf131a [diff] | |
| parent | fc0c68469f003f5470480b276560b925bcff4909 [diff] |
Merge klp-dev-plus-aosp into stage-aosp-master Change-Id: Ib7b1888248402804ce55782f52d08bf17fb434de