| commit | b7ec89d57e48eeff91dadfe30b572ad742e73b8c | [log] [tgz] |
|---|---|---|
| author | Anh Nguyen <anguyen@codeaurora.org> | Tue Mar 10 00:14:22 2015 -0700 |
| committer | Anh Nguyen <anguyen@codeaurora.org> | Tue Mar 10 00:14:22 2015 -0700 |
| tree | 340cf38ce23374a604499ffe18a66a6fbf02bc76 | |
| parent | 33174c8881664c3bbd87529207a8eefca7e8bbae [diff] | |
| parent | be50d8e8d747a4bd4bb0961b76b6f337d2fba65b [diff] |
Merge tag 'android-5.1.0_r1' into HEAD Android 5.1.0 release 1 Conflicts: chromium/java/com/android/webview/chromium/WebViewChromium.java Change-Id: I622f77972ebd8d30b321c1941a7a0e8e5265af1a