am c4e52d0e: resolve merge conflicts of 2b0f2db to lmp-mr1-dev-plus-aosp.

Browse Source

* commit 'c4e52d0ed9191be509d0bcabed3fcaeb42138be1':
  Switch to libsigchain.a

...

This commit is contained in:

Dmitriy Ivanov

2014-12-11 01:39:45 +00:00

committed by Android Git Automerger

parent 22fcfcd079 c4e52d0ed9

commit 39dcc579ff

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

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

Diff Content Not Available