This undoes the automerger skip which occured in
commit e740c84dc3 and
replays it as a standard (NOT -s ours) merge.
Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
Update to reflect new user interface and command line options
in Android 4.3+. Also add section on using application-level
tracing.
Fixes for bugs:
b/7306847
b/10113361
b/9425766
b/7306847
b/9262485
Change-Id: Ia1c2a54fa2edc12cd68da27055aebe7ec47df745
