diff options
| author | James Hawkins <jhawkins@google.com> | 2016-06-03 23:27:28 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 23:27:28 +0000 |
| commit | 12a11215b2c7d6c274056a4c39f48132ee160b42 (patch) | |
| tree | 2f0858da60f30c830b8a33c8746874dbcb93dbb3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3eec7d66dedfc7f769cf154bd1a8a93b3e94460b (diff) | |
| parent | 440e3c7dfed674bd56f1693e7c7a67e21cf707bb (diff) | |
Merge "am/UserController: Log system uptime at two \'boot complete\' markers." into nyc-dev am: eb47d6205f
am: 440e3c7dfe
* commit '440e3c7dfed674bd56f1693e7c7a67e21cf707bb':
am/UserController: Log system uptime at two 'boot complete' markers.
Change-Id: Idf1bc4cd1c317e230413eb48785ae78579460cb3
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions