| commit | 3bd35f3256c006ccb3fa72f11b190f2fc33ffe31 | [log] [tgz] |
|---|---|---|
| author | Andy Hung <hunga@google.com> | Sun Sep 20 00:13:25 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Sep 20 00:13:25 2015 +0000 |
| tree | b1442b557acfe0fbf1ccd8f26624ed0335f7a48c | |
| parent | 4eafd54324f08665a9b008f8ae9d8328299ed71f [diff] | |
| parent | f2951ae7d00a7d008699ff97ee5d383e27d0c72f [diff] |
am f2951ae7: am a5d8d21b: am 3266d75d: resolved conflicts for 6002f099 to lmp-sprout-dev * commit 'f2951ae7d00a7d008699ff97ee5d383e27d0c72f': DO NOT MERGE - Add security test for IEffect binder command