| commit | 11bdd5b10b5f921b657283fa94463263171218d5 | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Mon Nov 17 12:17:16 2014 -0800 |
| committer | Adam Lesinski <adamlesinski@google.com> | Mon Nov 17 12:17:16 2014 -0800 |
| tree | f439482e80559f310178bb050de770ca86fb0b23 | |
| parent | a9a3e24835b08828aa252bf079067a5f810a0792 [diff] | |
| parent | 06d8b7b8d216cbfcd4cd987649672a5856ccd797 [diff] |
Merge commit '06d8b7b8' into manualmerge Conflicts: core/jni/android_util_AssetManager.cpp Change-Id: I77b72d0d3ec8184ccd97419e4c76b7d55b1a52ca