commit | 79c3111f0a9a17fcb67379310743bad7cc0bbc5e | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed Apr 30 12:54:46 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 12:54:46 2014 +0000 |
tree | 3eb3f927cd293cb702e9c1d99c28fbaf2b70ebc3 | |
parent | 85dbfa8adb7e883c7a100b148c129ab82438ed7f [diff] | |
parent | e1d23239946734042de5ad1778aee9e1ac6669b2 [diff] |
am 89e762c3: am 5b3cd2cc: am d968d1a2: Merge klp-dev-plus-aosp into stage-aosp-master * commit '89e762c35c1cdadf410cf7aa5637a2f8cd1d1066':