| commit | e1d23239946734042de5ad1778aee9e1ac6669b2 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Wed Apr 30 12:50:25 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 12:50:25 2014 +0000 |
| tree | 78187a420b8ebf123d9133ac3eb504c1f73a2b77 | |
| parent | 00762492824dddf11d82934d4da24cf936a44bc4 [diff] | |
| parent | dc60db4c950de4e28a8f8af04fc770805c5563e1 [diff] |
am 5b3cd2cc: am d968d1a2: Merge klp-dev-plus-aosp into stage-aosp-master * commit '5b3cd2cc1351cf657aea09ac445da1e37dbc3336':