LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,290 Commits 2 Branches 0 Tags
e38afce3d97efda0e0947be1b1f5e3946694dbac
Commit Graph

18290 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dake Gu
e38afce3d9 am a09fe02d: Revert changes of adding guidedstep fragment in Browse 
* commit 'a09fe02d59a28e2706e3ca9095c46d9aaa40fe06':
  Revert changes of adding guidedstep fragment in Browse
 2015-08-18 23:42:24 +00:00
Dake Gu
a09fe02d59 Revert changes of adding guidedstep fragment in Browse 
Bug 23324164

Change-Id: I7a5fe395429e2b96f54953975f0722657d577330
 2015-08-18 16:03:55 -07:00
Robert Hahn
488d62f2a7 am a6b10a96: Merge "WIP: Added transitions to MainFragment." into mnc-ub-dev 
* commit 'a6b10a96b7e41c8f277b09b115f95d89393eb8d1':
  WIP: Added transitions to MainFragment.
 2015-08-18 17:21:57 +00:00
Robert Hahn
a6b10a96b7 Merge "WIP: Added transitions to MainFragment." into mnc-ub-dev 2015-08-18 17:17:21 +00:00
Dan Willemsen
128cd0c33b am 283439c7: am d592f8c7: Merge "Remove the mingw package check" 
* commit '283439c70091ab77daa566884db2c0f20bcac5c9':
  Remove the mingw package check
 2015-08-13 21:46:32 +00:00
Dan Willemsen
283439c700 am d592f8c7: Merge "Remove the mingw package check" 
* commit 'd592f8c716ec53b65cb9c046ae5b57a75082a929':
  Remove the mingw package check
 2015-08-13 21:39:44 +00:00
Dan Willemsen
d592f8c716 Merge "Remove the mingw package check" 2015-08-13 21:31:03 +00:00
Dan Willemsen
cb994dd019 Remove the mingw package check 
We're using mingw prebuilts checked into the tree now, the external
package is no longer necessary.

Change-Id: I349f9605d3d09decc3ec5df3ba595728c0a2727c
 2015-08-13 14:27:23 -07:00
Deepanshu Gupta
42143a4bd9 am a3df9910: am 40bd1993: Update revision for layoutlib and docs. 
* commit 'a3df99100ad3e3d1a8321ab86422d5ebca4345a7':
  Update revision for layoutlib and docs.
 2015-08-12 21:47:02 +00:00
Deepanshu Gupta
a3df99100a am 40bd1993: Update revision for layoutlib and docs. 
* commit '40bd1993edc56e8ede7e85d911bf172646b17dc5':
  Update revision for layoutlib and docs.
 2015-08-12 21:40:56 +00:00
Elliott Hughes
09f6a44afd am 51d2e710: am 944f23ec: Merge "AdbWinUsbApi.dll: fix race condition crash in WinUsb.dll" 
* commit '51d2e710c3f98ee85f0bb8a59d5450af9e23dd4e':
  AdbWinUsbApi.dll: fix race condition crash in WinUsb.dll
 2015-08-12 21:34:48 +00:00
Elliott Hughes
51d2e710c3 am 944f23ec: Merge "AdbWinUsbApi.dll: fix race condition crash in WinUsb.dll" 
* commit '944f23ec76229a474182cfdb7f6cea2330a8a5a9':
  AdbWinUsbApi.dll: fix race condition crash in WinUsb.dll
 2015-08-12 21:29:40 +00:00
Elliott Hughes
944f23ec76 Merge "AdbWinUsbApi.dll: fix race condition crash in WinUsb.dll" 2015-08-12 21:20:24 +00:00
Spencer Low
487b1deae9 AdbWinUsbApi.dll: fix race condition crash in WinUsb.dll 
There is a race condition in AdbWinUsbApi.dll where AdbCloseHandle() of an
interface would clobber the WinUsb handles, causing a concurrent
Adb{Read,Write}EndpointSync() to crash.

The fix is to make AdbCloseHandle(endpoint) set a flag to prevent future IOs
from starting up, abort any pending IOs, and wait for the pending IOs to abort.
Adb{Read,Write}EndpointSync() participates in this scheme.

There is still a race condition if the caller calls AdbCloseHandle(interface)
before calling AdbCloseHandle(endpoint). No AOSP code does this and assuming
that this never happens simplifies the fix.

This fix also ignores Adb{Read,Write}EndpointAsync() (the async APIs) since
those APIs are unused by AOSP.

This fix should not affect devices whose vendor supplies Windows USB drivers
that use a 'legacy kernel driver'. This causes AdbWinApi.dll to call a 'legacy
kernel driver' instead of AdbWinUsbApi.dll (which uses WinUsb.dll which uses a
kernel driver included with Windows). The source code for the 'legacy kernel
driver' was deleted from AOSP over 4 years ago, so it is probably deprecated
(I don't know the official status of it). Even so, I wouldn't be surprised if
some modern 3rd party devices were still using the legacy driver or a similar
driver derived from the original source code.

Also in this change:

 - Added a test case to adb_winapi_test that reproduces the race condition and
   verifies the fix.

 - adb_winapi_test misc: more strictly check return values and error codes,
   symbolize some dumped data to make things more readable, disable old test
   code that looked for specific hardware, test AdbGetInterfaceName() the same
   way adb uses it, fix dumping of initial "handshake".

 - Increased AdbWinUsbApi.dll file version info from 2.0.0.0 to 2.0.0.1.

 - Update AdbWinUsbApi.dll in prebuilt tree.

 - Include AdbWinUsbApi.pdb (debugging symbols) so the DLL can be debugged in
   the future (or at least so crash addresses can be manually symbolized).

 - Update AdbWinApi.dll, AdbWinUsbApi.dll, adb_winapi_test.exe build
   environments to WDK 7.1.0, which seems to be the publicly available closest
   version to what built the last version of these files.

   This entailed modifying SOURCES files to use USE_NATIVE_EH=1 instead of
   USER_C_FLAGS=/EHsc, removing /Wp64, manually setting DLL base addresses to
   the old address, using DEBUG_CRTS=1 to pickup the debug ATL for checked
   builds.

 - Update BUILDME.TXT files with up-to-date instructions.

 - For source files that are already majority CRLF, make the whole file CRLF.

 - Update SOURCES to explicitly set Windows Vista as the target. This means
   that future rebuilders don't need to worry as much about their build
   environment.

Bug: https://code.google.com/p/android/issues/detail?id=161890

Change-Id: I30a4e2ff3919929001c2319c4bb80354f7bcfda0
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
 2015-08-12 14:14:52 -07:00
Deepanshu Gupta
40bd1993ed Update revision for layoutlib and docs. 
Change-Id: Ida1f3b6feea6932ff8ff97a10f307acc8d1e9b85
 2015-08-12 14:08:32 -07:00
Xavier Ducrohet
49666b8d30 am 34f0f0e0: am 3c274b20: Update SDK component versions for the official SDK 23.0.0 
* commit '34f0f0e012447b41d6c860dae257af63178123d3':
  Update SDK component versions for the official SDK 23.0.0
 2015-08-12 19:49:10 +00:00
Xavier Ducrohet
34f0f0e012 am 3c274b20: Update SDK component versions for the official SDK 23.0.0 
* commit '3c274b20a2e98f149b62e24781cf39b41f379022':
  Update SDK component versions for the official SDK 23.0.0
 2015-08-12 19:39:59 +00:00
Xavier Ducrohet
3c274b20a2 Update SDK component versions for the official SDK 23.0.0 
Change-Id: Ibd0890977ce4123995403198b76fbbd7378f92b6
 2015-08-12 11:05:34 -07:00
Kris Giesing
7a72d3f284 am ec638482: Merge "Add editable actions to Guided Step test activity." into mnc-ub-dev 
* commit 'ec63848268e1ef04bab76502e393da18b5ef3ae7':
  Add editable actions to Guided Step test activity.
 2015-08-10 20:26:30 +00:00
Kris Giesing
ec63848268 Merge "Add editable actions to Guided Step test activity." into mnc-ub-dev 2015-08-10 19:59:40 +00:00
Konstantinos Menychtas
e950c79478 am 7ceca6fd: am 7cc14006: am c5a2819b: am d54746eb: am ee95843b: am b0abc5df: am 0f394210: am e855b6d9: (-s ours) am 55b696d1: am 6193ccb4: am 29699330: (-s ours) am 365f4ece: am c3eff933: am 70a395c4: (-s ours) am 35f73b6f: am 086adab4: am ed56df6f: am 91df3bc9: am a 
* commit '7ceca6fd106d420aa05329b15dd9fd8bf4dcb731':
 2015-08-08 18:01:52 +00:00
Nick Kralevich
fae289c95b am 27d49f76: am 88aa40df: am b4ef2aba: am f2a8aa34: am fdcade18: am ff246059: am 5fc6ca11: am d7138ba4: am 6ab0f7a9: am e8566ffb: am c0b3754c: am 98970843: am 4dec9d0d: am d2bd9baf: am 8d309635: am fdcb8bbb: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1 
* commit '27d49f769ee8e4eb9b8ac585c7e199689eae01c6':
 2015-08-08 18:01:50 +00:00
Konstantinos Menychtas
5d2dc8acc2 am 2d9e0fdd: am f6cf3cdd: am 82dea6f6: am 33c7b977: am 44a06cae: am fe281e20: am d886ba21: am 2235ef28: (-s ours) am 19cf6f34: am a6f725d6: am 26d66e55: (-s ours) am c5825853: am c6b7ecd7: am 4e5b7ad5: (-s ours) am 27ac85b1: am ed56df6f: am 91df3bc9: am a4bb0b7c: am d 
* commit '2d9e0fdd843067398760cac06f9299c14ef0cfb4':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
 2015-08-08 18:01:49 +00:00
Nick Kralevich
a6049a564b am 7e9863d9: am 73f7cb3d: am 497bcc4d: am 5e5f2ab3: am 1ea2e463: am 6d181dc0: am 63c3068a: am 8314da1c: am 3728b128: am 97af61da: am 178f5eee: am e1baec5d: am 4393aeff: am 947e4e27: am 29b060fa: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge - 
* commit '7e9863d9e280f01c490333bc3c9dbea0dc28ad66':
  Bump revision number for all system images
 2015-08-08 18:01:47 +00:00
Konstantinos Menychtas
7ceca6fd10 am 7cc14006: am c5a2819b: am d54746eb: am ee95843b: am b0abc5df: am 0f394210: am e855b6d9: (-s ours) am 55b696d1: am 6193ccb4: am 29699330: (-s ours) am 365f4ece: am c3eff933: am 70a395c4: (-s ours) am 35f73b6f: am 086adab4: am ed56df6f: am 91df3bc9: am a4bb0b7c: am d 
* commit '7cc1400624177a93b353002e5b03f23fa549c080':
 2015-08-08 17:54:32 +00:00
Nick Kralevich
27d49f769e am 88aa40df: am b4ef2aba: am f2a8aa34: am fdcade18: am ff246059: am 5fc6ca11: am d7138ba4: am 6ab0f7a9: am e8566ffb: am c0b3754c: am 98970843: am 4dec9d0d: am d2bd9baf: am 8d309635: am fdcb8bbb: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge - 
* commit '88aa40df01b83b05574a38ad1688ae930e150818':
 2015-08-08 17:54:30 +00:00
Konstantinos Menychtas
2d9e0fdd84 am f6cf3cdd: am 82dea6f6: am 33c7b977: am 44a06cae: am fe281e20: am d886ba21: am 2235ef28: (-s ours) am 19cf6f34: am a6f725d6: am 26d66e55: (-s ours) am c5825853: am c6b7ecd7: am 4e5b7ad5: (-s ours) am 27ac85b1: am ed56df6f: am 91df3bc9: am a4bb0b7c: am d5abe7ea: am c 
* commit 'f6cf3cdd41434bf4888aed9248e2c58b35c93c41':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
 2015-08-08 17:54:29 +00:00
Nick Kralevich
7e9863d9e2 am 73f7cb3d: am 497bcc4d: am 5e5f2ab3: am 1ea2e463: am 6d181dc0: am 63c3068a: am 8314da1c: am 3728b128: am 97af61da: am 178f5eee: am e1baec5d: am 4393aeff: am 947e4e27: am 29b060fa: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours) 
* commit '73f7cb3d9c756fd7a03464514c505d4b812debcb':
  Bump revision number for all system images
 2015-08-08 17:54:27 +00:00
Konstantinos Menychtas
7cc1400624 am c5a2819b: am d54746eb: am ee95843b: am b0abc5df: am 0f394210: am e855b6d9: (-s ours) am 55b696d1: am 6193ccb4: am 29699330: (-s ours) am 365f4ece: am c3eff933: am 70a395c4: (-s ours) am 35f73b6f: am 086adab4: am ed56df6f: am 91df3bc9: am a4bb0b7c: am d5abe7ea: am c 
* commit 'c5a2819b7c08c7cb3f4b8a136e8bdd318c69e06d':
 2015-08-08 17:34:20 +00:00
Nick Kralevich
88aa40df01 am b4ef2aba: am f2a8aa34: am fdcade18: am ff246059: am 5fc6ca11: am d7138ba4: am 6ab0f7a9: am e8566ffb: am c0b3754c: am 98970843: am 4dec9d0d: am d2bd9baf: am 8d309635: am fdcb8bbb: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours) 
* commit 'b4ef2aba5d4ab45ec535f851580a42b170d31850':
 2015-08-08 17:34:18 +00:00
Konstantinos Menychtas
f6cf3cdd41 am 82dea6f6: am 33c7b977: am 44a06cae: am fe281e20: am d886ba21: am 2235ef28: (-s ours) am 19cf6f34: am a6f725d6: am 26d66e55: (-s ours) am c5825853: am c6b7ecd7: am 4e5b7ad5: (-s ours) am 27ac85b1: am ed56df6f: am 91df3bc9: am a4bb0b7c: am d5abe7ea: am ccd11ec5: DO N 
* commit '82dea6f6b8b48a9a1b7171ecd6848602ec7211e2':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
 2015-08-08 17:34:17 +00:00
Nick Kralevich
73f7cb3d9c am 497bcc4d: am 5e5f2ab3: am 1ea2e463: am 6d181dc0: am 63c3068a: am 8314da1c: am 3728b128: am 97af61da: am 178f5eee: am e1baec5d: am 4393aeff: am 947e4e27: am 29b060fa: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours) 
* commit '497bcc4d87f29b151b6f4b8e4141cc6888138749':
  Bump revision number for all system images
 2015-08-08 17:34:15 +00:00
Konstantinos Menychtas
c5a2819b7c am d54746eb: am ee95843b: am b0abc5df: am 0f394210: am e855b6d9: (-s ours) am 55b696d1: am 6193ccb4: am 29699330: (-s ours) am 365f4ece: am c3eff933: am 70a395c4: (-s ours) am 35f73b6f: am 086adab4: am ed56df6f: am 91df3bc9: am a4bb0b7c: am d5abe7ea: am ccd11ec5: DO N 
* commit 'd54746eb8749beeb09d9d6c0e1babfa7cf09e6cf':
 2015-08-08 17:27:40 +00:00
Nick Kralevich
b4ef2aba5d am f2a8aa34: am fdcade18: am ff246059: am 5fc6ca11: am d7138ba4: am 6ab0f7a9: am e8566ffb: am c0b3754c: am 98970843: am 4dec9d0d: am d2bd9baf: am 8d309635: am fdcb8bbb: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours) 
* commit 'f2a8aa34eb137780e9fb0e7335355ec50db2cae6':
 2015-08-08 17:27:39 +00:00
Konstantinos Menychtas
82dea6f6b8 am 33c7b977: am 44a06cae: am fe281e20: am d886ba21: am 2235ef28: (-s ours) am 19cf6f34: am a6f725d6: am 26d66e55: (-s ours) am c5825853: am c6b7ecd7: am 4e5b7ad5: (-s ours) am 27ac85b1: am ed56df6f: am 91df3bc9: am a4bb0b7c: am d5abe7ea: am ccd11ec5: DO NOT MERGE Incr 
* commit '33c7b97781764b9a56b06aca3c5022fbd2da16b0':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
 2015-08-08 17:27:37 +00:00
Nick Kralevich
497bcc4d87 am 5e5f2ab3: am 1ea2e463: am 6d181dc0: am 63c3068a: am 8314da1c: am 3728b128: am 97af61da: am 178f5eee: am e1baec5d: am 4393aeff: am 947e4e27: am 29b060fa: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours) 
* commit '5e5f2ab38aac14351717f226e883d6b7ff62aebc':
  Bump revision number for all system images
 2015-08-08 17:27:35 +00:00
Konstantinos Menychtas
d54746eb87 am ee95843b: am b0abc5df: am 0f394210: am e855b6d9: (-s ours) am 55b696d1: am 6193ccb4: am 29699330: (-s ours) am 365f4ece: am c3eff933: am 70a395c4: (-s ours) am 35f73b6f: am 086adab4: am ed56df6f: am 91df3bc9: am a4bb0b7c: am d5abe7ea: am ccd11ec5: DO NOT MERGE Incr 
* commit 'ee95843b81a7afc16c83a63a780c3ac738c2ed20':
 2015-08-08 17:23:07 +00:00
Nick Kralevich
f2a8aa34eb am fdcade18: am ff246059: am 5fc6ca11: am d7138ba4: am 6ab0f7a9: am e8566ffb: am c0b3754c: am 98970843: am 4dec9d0d: am d2bd9baf: am 8d309635: am fdcb8bbb: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours) 
* commit 'fdcade18504881c84e264d0c5831df0ae00aa2ec':
 2015-08-08 17:23:06 +00:00
Konstantinos Menychtas
33c7b97781 am 44a06cae: am fe281e20: am d886ba21: am 2235ef28: (-s ours) am 19cf6f34: am a6f725d6: am 26d66e55: (-s ours) am c5825853: am c6b7ecd7: am 4e5b7ad5: (-s ours) am 27ac85b1: am ed56df6f: am 91df3bc9: am a4bb0b7c: am d5abe7ea: am ccd11ec5: DO NOT MERGE Increase the syst 
* commit '44a06cae629e2ab3b6519f21e5dce82006d76e83':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
 2015-08-08 17:23:05 +00:00
Nick Kralevich
5e5f2ab38a am 1ea2e463: am 6d181dc0: am 63c3068a: am 8314da1c: am 3728b128: am 97af61da: am 178f5eee: am e1baec5d: am 4393aeff: am 947e4e27: am 29b060fa: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours) 
* commit '1ea2e463a3edef81ff2a4d166eadd826dc0b3bdd':
  Bump revision number for all system images
 2015-08-08 17:23:03 +00:00
Konstantinos Menychtas
ee95843b81 am b0abc5df: am 0f394210: am e855b6d9: (-s ours) am 55b696d1: am 6193ccb4: am 29699330: (-s ours) am 365f4ece: am c3eff933: am 70a395c4: (-s ours) am 35f73b6f: am 086adab4: am ed56df6f: am 91df3bc9: am a4bb0b7c: am d5abe7ea: am ccd11ec5: DO NOT MERGE Increase the syst 
* commit 'b0abc5dfe487f2dd311942e90da10063a1b63500':
 2015-08-08 17:14:56 +00:00
Nick Kralevich
fdcade1850 am ff246059: am 5fc6ca11: am d7138ba4: am 6ab0f7a9: am e8566ffb: am c0b3754c: am 98970843: am 4dec9d0d: am d2bd9baf: am 8d309635: am fdcb8bbb: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours) 
* commit 'ff246059fcf6d2071558ba490d30256e1e56e153':
 2015-08-08 17:14:54 +00:00
Konstantinos Menychtas
44a06cae62 am fe281e20: am d886ba21: am 2235ef28: (-s ours) am 19cf6f34: am a6f725d6: am 26d66e55: (-s ours) am c5825853: am c6b7ecd7: am 4e5b7ad5: (-s ours) am 27ac85b1: am ed56df6f: am 91df3bc9: am a4bb0b7c: am d5abe7ea: am ccd11ec5: DO NOT MERGE Increase the system-image revi 
* commit 'fe281e20be84db5cdca9c26713d57bca42c27f88':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
 2015-08-08 17:14:53 +00:00
Nick Kralevich
1ea2e463a3 am 6d181dc0: am 63c3068a: am 8314da1c: am 3728b128: am 97af61da: am 178f5eee: am e1baec5d: am 4393aeff: am 947e4e27: am 29b060fa: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours) 
* commit '6d181dc06a7746f47e6ff15e5e65212e0491d7d7':
  Bump revision number for all system images
 2015-08-08 17:14:51 +00:00
Konstantinos Menychtas
b0abc5dfe4 am 0f394210: am e855b6d9: (-s ours) am 55b696d1: am 6193ccb4: am 29699330: (-s ours) am 365f4ece: am c3eff933: am 70a395c4: (-s ours) am 35f73b6f: am 086adab4: am ed56df6f: am 91df3bc9: am a4bb0b7c: am d5abe7ea: am ccd11ec5: DO NOT MERGE Increase the system-image revi 
* commit '0f394210b6e1d762866bde67f4b1679e4758ba47':
 2015-08-08 17:06:58 +00:00
Nick Kralevich
ff246059fc am 5fc6ca11: am d7138ba4: am 6ab0f7a9: am e8566ffb: am c0b3754c: am 98970843: am 4dec9d0d: am d2bd9baf: am 8d309635: am fdcb8bbb: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours) 
* commit '5fc6ca1190052933938b6cf70d1f3f696e0db7a5':
 2015-08-08 17:06:57 +00:00
Konstantinos Menychtas
fe281e20be am d886ba21: am 2235ef28: (-s ours) am 19cf6f34: am a6f725d6: am 26d66e55: (-s ours) am c5825853: am c6b7ecd7: am 4e5b7ad5: (-s ours) am 27ac85b1: am ed56df6f: am 91df3bc9: am a4bb0b7c: am d5abe7ea: am ccd11ec5: DO NOT MERGE Increase the system-image revision number a 
* commit 'd886ba21b1f9f9ccd0dd0fab17f58d280470f7b1':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
 2015-08-08 17:06:56 +00:00
Nick Kralevich
6d181dc06a am 63c3068a: am 8314da1c: am 3728b128: am 97af61da: am 178f5eee: am e1baec5d: am 4393aeff: am 947e4e27: am 29b060fa: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours) 
* commit '63c3068ac343cec183bff4afd5fd05dbbf3ccede':
  Bump revision number for all system images
 2015-08-08 17:06:55 +00:00
Konstantinos Menychtas
0f394210b6 am e855b6d9: (-s ours) am 55b696d1: am 6193ccb4: am 29699330: (-s ours) am 365f4ece: am c3eff933: am 70a395c4: (-s ours) am 35f73b6f: am 086adab4: am ed56df6f: am 91df3bc9: am a4bb0b7c: am d5abe7ea: am ccd11ec5: DO NOT MERGE Increase the system-image revision number after openg 
* commit 'e855b6d9428a4aa6c61bb0a9411d857be27ddcf6':
 2015-08-08 17:01:55 +00:00
Nick Kralevich
5fc6ca1190 am d7138ba4: am 6ab0f7a9: am e8566ffb: am c0b3754c: am 98970843: am 4dec9d0d: am d2bd9baf: am 8d309635: am fdcb8bbb: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours) 
* commit 'd7138ba4bf0d0201cceebfd6c5d27585870a7b5f':
 2015-08-08 17:01:54 +00:00