| commit | 3c6ffbc6fec456bd25a3dad85d45a444b807d020 | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Mon Sep 21 21:41:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 21:41:46 2015 +0000 |
| tree | 70cbb90ad5afdb63de251c36181524a93701c74a | |
| parent | 6bb611d38fc874fb5fd178076de648225f575b34 [diff] | |
| parent | 984bd8323dcb5e494a04b2058ab7de40bf347ee5 [diff] |
am 984bd832: resolved conflicts for 5caca3dd to mnc-dr-dev-plus-aosp * commit '984bd8323dcb5e494a04b2058ab7de40bf347ee5': add system-background cpuset