| commit | 26d8120e1cda9991d6d3392fbd89b9f3d3e46e64 | [log] [tgz] |
|---|---|---|
| author | Dimitry Ivanov <dimitry@google.com> | Thu Mar 03 17:36:09 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Mar 03 17:36:09 2016 +0000 |
| tree | bd59b8eec0ceb319e3c148a67bdff7c96baffb5d | |
| parent | 6b157527117a7e008a8a31c28985b349881cee51 [diff] | |
| parent | f2bde42bec7f3fd8dfa179808fdc43e3d2a673ae [diff] |
resolve merge conflicts of goog/stage-aosp-master to nyc-dev-plus-aosp am: 323df6ae33 * commit '323df6ae334c1799c2c966434b05792db8cdd087': Fix locking of libnativeloader Added function to explicitly initialize a namespace