am 2ba30617: resolved conflicts for merge of 652c4854 to lmp-dev-plus-aosp

Browse Source

* commit '2ba30617596dfe91a75348f98f9716c0d72d7671':
  service_manager: check binder passed lengths

...

This commit is contained in:

Nick Kralevich 2014-07-14 21:40:25 +00:00 committed by Android Git Automerger

parent 63f492dde9 2ba3061759

commit 478171a924

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available