| commit | 39dcc579ff7330e0240727fcbc934cb9777b0475 | [log] [tgz] |
|---|---|---|
| author | Dmitriy Ivanov <dimitry@google.com> | Thu Dec 11 01:39:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 11 01:39:45 2014 +0000 |
| tree | 4ee54a19e83f862829d29c44e8053346266c775b | |
| parent | 22fcfcd079d878c8f7804225585025e542d8a8c4 [diff] | |
| parent | c4e52d0ed9191be509d0bcabed3fcaeb42138be1 [diff] |
am c4e52d0e: resolve merge conflicts of 2b0f2db to lmp-mr1-dev-plus-aosp. * commit 'c4e52d0ed9191be509d0bcabed3fcaeb42138be1': Switch to libsigchain.a