• Home
  • History
  • Annotate
  • only in /external/chromium_org/mojo/shell/android/apk/
History log of /external/chromium_org/mojo/shell/android/apk/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
5f1c94371a64b3196d4be9466099bb892df9b88e 12-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 288042

This commit was generated by merge_to_master.py.

Change-Id: I583602ff16d735199f1810565c9296e970ce2854
ndroidManifest.xml
116680a4aac90f2aa7413d9095a592090648e557 21-Jul-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 284076

This commit was generated by merge_to_master.py.

Change-Id: I9a279485b02fe7ceddcd32d992a714ff132e99ae
rc/org/chromium/mojo_shell_apk/MojoMain.java
rc/org/chromium/mojo_shell_apk/MojoShellActivity.java
5c02ac1a9c1b504631c0a3d2b6e737b5d738bae1 01-May-2014 Bo Liu <boliu@google.com> Merge from Chromium at DEPS revision 267519

This commit was generated by merge_to_master.py.

Change-Id: I6002987b71e09742c68bad9c834ae800ff531f25
rc/org/chromium/mojo_shell_apk/MojoMain.java
rc/org/chromium/mojo_shell_apk/MojoShellActivity.java
c5cede9ae108bb15f6b7a8aea21c7e1fefa2834c 10-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 262940

This commit was generated by merge_to_master.py.

Change-Id: I9a3fddbb29857fa8f68a18c6a0115862b65f84d1
rc/org/chromium/mojo_shell_apk/MojoShellActivity.java
effb81e5f8246d0db0270817048dc992db66e9fb 31-Mar-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 260458

This commit was generated by merge_to_master.py.

Change-Id: I140fa91b7f09c8efba4424e99ccb87b94a11d022
rc/org/chromium/mojo_shell_apk/MojoShellActivity.java
5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7 21-Feb-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 251904

This commit was generated by merge_to_master.py.

Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
rc/org/chromium/mojo_shell_apk/LibraryLoader.java
rc/org/chromium/mojo_shell_apk/MojoShellActivity.java
a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7 18-Dec-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 240154

This commit was generated by merge_to_master.py.

Change-Id: I8f2ba858cf0e7f413dddedc2ae91dc37f7136c2e
rc/org/chromium/mojo_shell_apk/LibraryLoader.java
f2477e01787aa58f445919b809d89e252beef54f 28-Nov-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 237746

This commit was generated by merge_to_master.py.

Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
ndroidManifest.xml
0f1bc08d4cfcc34181b0b5cbf065c40f687bf740 06-Nov-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 232870

This commit was generated by merge_to_master.py.

Change-Id: I9cd2139013538e8bcd17966e8ff30ca5651d1a3d
es/layout/mojo_shell_activity.xml
rc/org/chromium/mojo_shell_apk/MojoShellActivity.java
rc/org/chromium/mojo_shell_apk/MojoView.java
1e9bf3e0803691d0a228da41fc608347b6db4340 31-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 232015

This commit was generated by merge_to_master.py.

Change-Id: If86767ad396b9e2e1a4c1e9df1427daea29703ef
ndroidManifest.xml
es/layout/mojo_shell_activity.xml
es/values/strings.xml
rc/org/chromium/mojo_shell_apk/LibraryLoader.java
rc/org/chromium/mojo_shell_apk/MojoMain.java
rc/org/chromium/mojo_shell_apk/MojoShellActivity.java
rc/org/chromium/mojo_shell_apk/MojoShellApplication.java
rc/org/chromium/mojo_shell_apk/MojoView.java