| commit | fcf9ab5ab3e158cea2559ed4e7274dbfeb0a6e77 | [log] [tgz] |
|---|---|---|
| author | Yasuhiro Matsuda <mazda@google.com> | Wed Sep 02 14:31:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 02 14:31:26 2015 +0000 |
| tree | b6b618aff85b0f88983ee76f31aa71e6956c38e1 | |
| parent | 082fb1d8cb70952cda4d5ee1e79af3ee4572271a [diff] | |
| parent | ebf9465d213336819b15e3b21d02afce64470d4f [diff] |
am ebf9465d: resolved conflicts for merge of ef57e5e0 to stage-aosp-master * commit 'ebf9465d213336819b15e3b21d02afce64470d4f': Add trace code to system server.