| commit | 28c53d1dee6467dc55abdacd68f829dd6723a888 | [log] [tgz] |
|---|---|---|
| author | Andy Hung <hunga@google.com> | Thu May 05 23:00:02 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 05 23:00:02 2016 +0000 |
| tree | 6469947264aef4ca29edbf9dd3a4bbff114044a6 | |
| parent | d3ae4f363ad29ff790b4dc0bcef4ea0810a8b939 [diff] | |
| parent | 2c9e1fc831040766fe3e7ba87da75a3976be5c33 [diff] |
Merge "Merge "Merge "Merge "DO NOT MERGE: Fix AudioPolicyBinderTest test_isStreamActive" into kitkat-cts-dev am: a914c7ff8a -s ours" into lollipop-cts-dev am: 67f05410f7 -s ours" into lollipop-mr1-cts-dev am: 1bdc00624f -s ours" into marshmallow-cts-dev am: 7067375079 -s ours am: 2c9e1fc831 * commit '2c9e1fc831040766fe3e7ba87da75a3976be5c33': DO NOT MERGE: Fix AudioPolicyBinderTest test_isStreamActive Change-Id: I2b8dc80e9a594cc3c0fe42388627f5af22b59afa