| commit | 8a4348bb7a598eab9b692d782595689112df367a | [log] [tgz] |
|---|---|---|
| author | Andy Hung <hunga@google.com> | Wed May 25 19:42:39 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 25 19:42:39 2016 +0000 |
| tree | 68330027ea8dc0ca59ddeeba091eada0c39803dc | |
| parent | 96e9bfd9b9f80c10e27667e2590aa07c4d7757d0 [diff] | |
| parent | 6b0a8693e169a97f5fd92260bcbd437b514d7691 [diff] |
resolve merge conflicts of 5d8e380 to nyc-mr1-dev am: b09a6d0832 am: 6b0a8693e1 * commit '6b0a8693e169a97f5fd92260bcbd437b514d7691': AudioTrack: Fix timestamp startup condition Change-Id: Ie11abf463d4ca8b065fffc66bfb1c4db37a3ca4c