Commit Graph

13374 Commits

Author SHA1 Message Date
bohu
33bd8cb700 Bump revision number for system images
Bump revision number for all system images by 1, since
we are going to publish newer system images that has
some gles fixes.

Change-Id: I1a79164a46bd09d41b5102699ec3ec5ae6961a83
2015-02-12 16:59:17 -08:00
bohu
f8ac5e3178 back port gles fix to api 17
Following CLs are ported:

        717e625415c4398431b84851ba1b76d8c59ae9cf Add shader version to glGetString
        32c30975ea654b9654ad9dade0d25b9856e63f1b Add parameters validation to glShaderSource() API
        b0c7cce25bf9323a359800a86c0c7609db2acea4 Fix eglDestroyContext and glTexImage2D
        2fc65202c214640c55b52c29bbc9213170d0b533 handles glGetBooleanv when value is nonboolean
        beda8027439b9c20475b8a3d379823d09fca3abb Properly initialize GLClientState's m_states
        84684ec571a1db94e32a67cb7d154ab562dd0d7f Unbind buffer when buffer is deleted
        89b7aac84f8babab93ff5326ad492164d971c421 Handle empty data parameter in glTexSubImage2D_enc
        adb0f74f792ba7bca20257b9c0ea41ebda9bb229 Allow glGetProgramInfoLog_enc to have empty length
        b31166704ddb7751619cf0bbc4f2f4575c0ad3c4 Guard against negative buffer size
        641f35af08a0a4c46586a592ff4e703e866d581a Guard against negative width and height
        9d18698dd8da15937f80e5476d73400a011934be Handle empty buffer in QemuPipeStream::writeFully
        40a674e0d0acac87aa25eb9de720dc2fb07d9e4f Fix emulator crashes on glDrawElements command
        7fa2b92de2058a3556e5f38a135de415bb3d5e45 Merge "Use more appropriate type in cb_handle_t::validate."
        fe2c5beb964d2e2aecedb02b9cca592e0811d90b Use more appropriate type in cb_handle_t::validate.
        376688e76694bf5b8672379c540b1bda059da682 Merge "ranchu: Fix goldfish_pipe definitions."
        e3e686593cc8bdaf3ca4f6fa0b33b62a6951d1d6 ranchu: Fix goldfish_pipe definitions.
        7d3d0c99d2c82319e001289d1b9e091e5ff8f7aa Merge "ranchu: Add ARM64-specific root/ramdisk config files."
        d0fead3c53d6e450deb69aad72651e132b6cc072 ranchu: Add ARM64-specific root/ramdisk config files.
        638ee524f83053613c47ddea22c4bf98a0175c2f Merge "Remove display initialization from eglGetProcAddress API"
        7a2929cd6548693b581c17ba69308a49e03c56be Remove display initialization from eglGetProcAddress API
        9b1e6c5a3ccd943b7158dce83387fbfcc1162d69 Merge "Make the size of "cb_handle_t" same for 32/64-bit"
        7ea757df0311bfb7310a7a765dcec1b79f39f25d Merge "goldfish: camera: fix 64-bit warnings"
        3725c7c982eac52ec64a625e82f306822452941c goldfish: camera: fix 64-bit warnings
        eed789f036cbcedf2fa96ae3e273c2234102d340 Merge "goldfish: Fix /cache partition type."
        f55ac4fc027ae3d97f4faaa6ccd65480f493dea7 goldfish: Fix /cache partition type.
        690792a66c7fca6bf0aa17c2d5043ab86d145965 Merge "Revert "Revert "goldfish: cache image is not ext4. yet."""
        8853df9503e0edec6cac0e1e0840fa111d57a79a Revert "Revert "goldfish: cache image is not ext4. yet.""
        d8a6e67044ddcac7c53adbe6b871c33447110905 Merge "Revert "goldfish: cache image is not ext4. yet.""
        5e2caf7883279113d6f5f4777122dc88262c34c6 Revert "goldfish: cache image is not ext4. yet."
        3f62b50d45441ae077c958423e9e301acd5dcc11 Make the size of "cb_handle_t" same for 32/64-bit
        aec15d91ee48797f2b3c3fe61cca977900ebcd47 am 646f0b25: Merge "opengl: rcOpenColorBuffer must be synchronous"
        646f0b25e63164950d1d99b9b8021be74c2321c6 Merge "opengl: rcOpenColorBuffer must be synchronous"
        c542f3d8fc89678574b2fa650395f3dfac991a20 opengl: rcOpenColorBuffer must be synchronous
        6ccaeebd78dcb5e20e2c0e81cdc571fb74f9cfb7 am 2c6c08a2: Merge "Move goldfish from fdprintf to POSIX dprintf."
        2c6c08a23d2f5f760753745be5b67fe5759dcc91 Merge "Move goldfish from fdprintf to POSIX dprintf."
        0228f8a1cdf5b2391201333de73fabab6d2ca72f Move goldfish from fdprintf to POSIX dprintf.
        dbda557d4dcf022850ea4ab4f89e1c154e2aea04 am 5cb5779a: Merge "gralloc: don\'t initialize reserved_proc"
        5cb5779ad0ad75a59bfb8ce42317a4ee18300281 Merge "gralloc: don't initialize reserved_proc"
        e46eea0b5bdef28f5c42e4d7764b030679479354 gralloc: don't initialize reserved_proc
        67334d0b9d0da7595daf07a3e9bea6a55436e296 Merge commit 'd9dc763708823aa865983bb8dc37b5ecc5669620' into HEAD
        7076e4647af737393baf020c13e81a090f4a9f26 Merge "Add 64-bit software GLES/EGL support in gralloc.goldfish module"
        3f92be74c1e9b2314d4c0f8feaacf7bafce7dedc Add 64-bit software GLES/EGL support in gralloc.goldfish module
        61a8f0bbc146a4050a885e1e7c314dfc4ab72779 Merge "Fix the Chrome app crash in emulator issue"
        bd93fee73b02d0b223b441c34a4f8e04eb57291d Merge "Support GLES acceleration in 64bit emulator on device side"
        a1de8e2f5e4c29341be01bae364a54d92d14c742 Fix the Chrome app crash in emulator issue
        4f94a5f8b13a5fdd80988e77dd5d468b958b0117 Merge "Remove the useless folder and files in emulator GLES/EGL drivers"
        31aad5c0a0de056114b6bb843a5c37d8de6e46e4 Remove the useless folder and files in emulator GLES/EGL drivers
        aedc716648071a1403f4ac92a380d1d4a5377052 Support GLES acceleration in 64bit emulator on device side
        d9dc763708823aa865983bb8dc37b5ecc5669620 am aedf829a: Merge "goldfish: cache image is not ext4. yet."
        aedf829a920c3100de5caa49b0dec02d66eed96b Merge "goldfish: cache image is not ext4. yet."
        a2543be45f35ab7ace3ecd92c99a3c72150622ec goldfish: cache image is not ext4. yet.
        9dba558f4621d3d70a05c0a3d8e2c34b3883f866 am 48a76778: Merge "Remove #include <asm/page.h>."
        644f53c8705586705c27b799e5b5f303118e8b3c am 155ca91c: Merge topic \'emu64\'
        48a76778937abadf5cbd260696a29d737134d0d9 Merge "Remove #include <asm/page.h>."
        1daf365476f888a5d9534607c8299a3b5160b4a7 Remove #include <asm/page.h>.
        155ca91c1253bcb85a0eeec93ded6da07122d4ff Merge topic 'emu64'
        324a0c43835b935721c938a2684874e0b5bf8311 Disable echo on all tty lines
        8bb5f92dcd48dbbaa69ab15f97aca13d49b08599 ueventd.goldfish.rc: set system permissions for /dev/goldfish_pipe
        5b31b113176dec8d7fcfb5650f3dd7b01baf605c am 48107fa1: Merge "device/generic/goldfish: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
        48107fa1dd354f8667b74f335c3f82f472b7d112 Merge "device/generic/goldfish: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
        5212e4a903d2654572b8bdde0bda3bdd6ecbee6e device/generic/goldfish: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
        2061519f3e55ba1dac643cac34a4aa6f0f0dfeee am 44c72ca0: Merge "Vibra: Add the vibrator module for goldfish"
        44c72ca0b92c75ffef5e691a24d5d06d6a3e7baa Merge "Vibra: Add the vibrator module for goldfish"
        0f41b57f2aa2ffa8fd90ebd50c13c2dd0249ee0f Vibra: Add the vibrator module for goldfish
        ac534df6c39944a91f157819628db3d6f63b75f1 am 59922432: Merge commit \'f09bc5256e48a44eec9ca47ba838c12d0e89a198\' into HEAD
        59922432be859a46eeb76650b24308505625da36 Merge commit 'f09bc5256e48a44eec9ca47ba838c12d0e89a198' into HEAD
        144d2d5d683928f393a9567c443c8f5af13dfdd0 am b9a62053: Merge commit \'828bd482a1aeacf96d5f3a3e0701029d9f890c5f\' into HEAD
        b9a62053cf74025a43c8baa118d52729e38cc176 Merge commit '828bd482a1aeacf96d5f3a3e0701029d9f890c5f' into HEAD
        a648b35cca58d3d1608e1beb21028f91bd0b9df7 am 2befc3ed: Merge "Modify the build targets for goldfish from to include aosp*."
        2befc3edc583afb43a4f6740f0af0534eac8e9d5 Merge "Modify the build targets for goldfish from to include aosp*."
        bc233492e3ce3af8cc23496ee58cd3dc1b74d0f0 Modify the build targets for goldfish from to include aosp*.
        f09bc5256e48a44eec9ca47ba838c12d0e89a198 am b9a7de1a: Merge "Delete buffer data when removing it from the SharedGroup namespace"
        b9a7de1a690bc638496e0550e6a9ebe859fc0315 Merge "Delete buffer data when removing it from the SharedGroup namespace"
        8562d1b6e089254837da3ab2d272c65c3bb5d8c7 Delete buffer data when removing it from the SharedGroup namespace
        f8b99f123467cd6164d071237f5dbe703f9ea2d7 am 6b151ca8: Merge "Catch divide by zero case in drawCheckerBoard() function."
        6b151ca8833aa7271e311436dad97588b71b7a38 Merge "Catch divide by zero case in drawCheckerBoard() function."
        d7cc5da79d828ec6cb21926be13265fc52715e2f am 84309165: Merge "Drop setting of in_qemu boolean and restorecon /sys/qemu_trace."
        84309165ca52b7446e388c13127fd6e305833f24 Merge "Drop setting of in_qemu boolean and restorecon /sys/qemu_trace."
        46bcb5f7a64ccd440d5a292c7afd2e2b5c2bee4f Drop setting of in_qemu boolean and restorecon /sys/qemu_trace.
        b0b6afb44269263afa080ecc643f2c4866adfb38 Catch divide by zero case in drawCheckerBoard() function.
        828bd482a1aeacf96d5f3a3e0701029d9f890c5f am 2524d396: Update emulator to FUSE-wrap its SD card.
        2524d39681566f4eca7afb7950e05ab642978263 Update emulator to FUSE-wrap its SD card.
        e8122dff1ef2de4d41835265a59d8960e7800fae camera3: Fix stream id types
        3ad13188d4e7e873947040ec22a35d73efb76812 Camera2/3: Implement full-color NV21 output.
        a4c19be9274d8bb993f88a6a1cbd2ad92f4a48fa Merge "Added net.dns1 prop for emulator, as Android emulator ignores it by default."
        ccb835ba267e927f7df759290bd46ac78712a3b2 Merge "Camera2/3: Update static metadata"
        0049ee8925212a3a5ff095a8a66cab184adf8f1b Camera2/3: Update static metadata
        8ff1e5f1e3e24baf311e6263b48f389c206f14ac am 8f9288ea: goldfish: use fstab.goldfish
        8f9288eaf10b50d19038f5c7024616e147c64735 goldfish: use fstab.goldfish
        e96a7c7da79939c509a7517f2b2de37e840a6390 Added net.dns1 prop for emulator, as Android emulator ignores it by default.
        ff3a362fb9aca15285a95cad6baa08e961330e8e am bf34d172: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
        bf34d1722ea1ebdf779837611220b5269bd35968 Reconcile with jb-mr2-zeroday-release - do not merge
        d9fcbd08b0413fedc8219237534ce31d6b7fd2f5 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
        ad9dd4bfdfa9ab6ccfc4be14305b6ed8b9a0ab5a am 2c84e47e: am 07a4c8b4: Camera3: Fix default AE mode
        2c84e47e3d0085b1222de94013c75c0328b02492 am 07a4c8b4: Camera3: Fix default AE mode

Change-Id: I3902e73cf96f9d64d56d939dce2673ad5710f6cb
2015-02-03 17:42:11 -08:00
Trevor Johns
bd48d1e676 am 05ef7f04: DO NOT MERGE: Package samples for Clockwork Beryl (API 20, Samples Rev 3)
* commit '05ef7f04976081f8d2421b579c813c4ade72bbd2':
  DO NOT MERGE: Package samples for Clockwork Beryl (API 20, Samples Rev 3)
2014-10-24 06:52:13 +00:00
Takeshi Hagikura
3bb3da96ae resolved conflicts for merge of 11e09fc0 to klp-modular-dev
Extracted the diff for those files between klp-modular-docs and klp-modular-dev in case
https://paste.googleplex.com/5232937083600896

Change-Id: I94950ba66f15b75c1ead60e9f6b38b67e4fa9d6e
2014-10-24 01:39:19 +00:00
Trevor Johns
05ef7f0497 DO NOT MERGE: Package samples for Clockwork Beryl (API 20, Samples Rev 3)
Change-Id: I70b64fc852a9ebd63acd0eca352988f63210b7dd
2014-10-22 20:28:20 +00:00
Takeshi Hagikura
11e09fc057 Deletes the wear samples that have been commited in the wrong place.
Updates the location of wear samples in sdk.atree
Adds SpeedTracker wear sample (https://googleplex-android-review.git.corp.google.com/564608)

Conflicts:
	samples/wearable/AgendaData/Application/build.gradle
	samples/wearable/AgendaData/Application/proguard-rules.txt
	samples/wearable/DataLayer/Application/build.gradle
	samples/wearable/DataLayer/Wearable/src/main/AndroidManifest.xml
	samples/wearable/DelayedConfirmation/Application/build.gradle
	samples/wearable/FindMyPhone/Application/build.gradle
	samples/wearable/FindMyPhone/Application/src/main/AndroidManifest.xml
	samples/wearable/Flashlight/Wearable/proguard-rules.txt
	samples/wearable/Geofencing/Application/build.gradle
	samples/wearable/GridViewPager/Wearable/src/main/java/com/example/android/wearable/gridviewpager/MainActivity.java
	samples/wearable/Quiz/Application/build.gradle
	samples/wearable/SynchronizedNotifications/Application/build.gradle
	samples/wearable/SynchronizedNotifications/Application/src/main/java/com/example/android/wearable/synchronizednotifications/PhoneActivity.java
	samples/wearable/SynchronizedNotifications/Wearable/build.gradle
	samples/wearable/SynchronizedNotifications/Wearable/src/main/java/com/example/android/wearable/synchronizednotifications/NotificationUpdateService.java

(cherry picked from commit 83642406f8)
Signed-off-by: Trevor Johns <trevorjohns@google.com>

Change-Id: I7107d45d9c54e7d8dc317bd562608d661a8b5284
2014-10-22 11:20:52 -07:00
Trevor Johns
9875ec66e1 am fb67b1ed: Merge "Add samples to sdk.atree" into klp-modular-docs
* commit 'fb67b1ed063744889a74e0ff15655affa0bc5c04':
  Add samples to sdk.atree
2014-10-16 00:29:32 +00:00
Trevor Johns
fb67b1ed06 Merge "Add samples to sdk.atree" into klp-modular-docs 2014-10-16 00:24:55 +00:00
Trevor Johns
679920d809 Merge commit '3992ec56' into klp-modular-dev
Merged with '-s ours', since the DO NOT MERGE directive from
3992ec56 wasn't properly recognized.

Change-Id: If5abab964ab49a6ce02e8da1ff67d2ee12d1b7de
2014-10-08 17:41:47 -07:00
Trevor Johns
3992ec5675 Update sdk_repo samples 20 from 1 to 2
DO NOT MERGE

Change-Id: Ia9d89a28991fc1ac4d81e18fe596bc793e54353c
2014-10-02 18:36:43 -07:00
Naoki Ishihara
a9b5dd3bb3 Add samples to sdk.atree
Change-Id: I34ee63184f2dea6db253bf2ae2b671abb9ab6c4a
2014-09-19 22:17:08 -07:00
anaddaf
543a86c17b Merge "Removing the screenOrientation attribute from the wearable manifest" into klp-modular-dev 2014-09-10 16:26:16 +00:00
anaddaf
34eb5d8c69 Removing the screenOrientation attribute from the wearable manifest
Bug: 17397357
Change-Id: I81cc3500d25fe22b21ba820d8999a547d8d78097
2014-09-10 09:20:17 -07:00
anaddaf
ee12f01d6b Updating build.gradle files for play services dependency
A number of samples were not using the play services from the
repository. In one sample, the incorrect variant
of play services was used on the wearable module.

Bug: 17196108
Change-Id: I5276747a0c7eaf48c542d2540c36819422839d9b
2014-09-10 09:10:50 -07:00
Raphael Moll
18ec7c4f8a resolved conflicts for merge of 566a4694 to klp-modular-dev
Change-Id: I04c6c2fdff66e5e82f5f99cc629f9eaa5725ef26
2014-08-22 11:26:33 -07:00
Raphael Moll
566a46941e am 76c7aa35: Update sdk_repo samples 19 rev from 5 to 6. DO NOT MERGE.
* commit '76c7aa353666479df9545a66f3f49eb8ff69a86e':
  Update sdk_repo samples 19 rev from 5 to 6. DO NOT MERGE.
2014-08-22 16:53:16 +00:00
Raphael Moll
76c7aa3536 Update sdk_repo samples 19 rev from 5 to 6. DO NOT MERGE.
Change-Id: I140d043086c8da434a8b6bf16cfb3c3763e2ba89
2014-08-22 04:28:39 +00:00
anaddaf
d97ecae3db Upating the "date" content of notifications to include seconds
Including "seconds" in the content of notifications to enables fast
creation/update of notifications; previously, the watch-only ones
could be created once every minute.

Bug: 16898049
Change-Id: Idd7a5b78d4cc948d4c8b3862fd998a91044d6007
2014-08-15 09:46:44 -07:00
Naoki Ishihara
340f9ee644 am 897d76c8: Adding browsable prebuilt samples for August push
* commit '897d76c8a5a3674fb494794b50721697cfbd2c20':
  Adding browsable prebuilt samples for August push
2014-08-14 22:34:58 +00:00
Naoki Ishihara
096d3f7723 am 89230cf8: am 56d2cb15: Adding browsable prebuilt samples for August push
* commit '89230cf8482c5c67e7fea4f87a1e31ecfc4375f7':
  Adding browsable prebuilt samples for August push
2014-08-14 22:32:16 +00:00
Naoki Ishihara
89230cf848 am 56d2cb15: Adding browsable prebuilt samples for August push
* commit '56d2cb15b332fc44ccd755693a644c007e616dc4':
  Adding browsable prebuilt samples for August push
2014-08-14 22:29:04 +00:00
Naoki Ishihara
897d76c8a5 Adding browsable prebuilt samples for August push
Change-Id: I7b10e94da639ad0e304abd2507c66265073d2398
2014-08-14 22:23:08 +00:00
Naoki Ishihara
56d2cb15b3 Adding browsable prebuilt samples for August push
Change-Id: I7b10e94da639ad0e304abd2507c66265073d2398
2014-08-14 15:16:04 -07:00
Mark Renouf
35b1a50abd Explicitly call onApplyWindowInsets from a listener
Fixes layout for round displays, following revert of 41d69c3
(ag/512678 - "Override dispatchApplyWindowInsets in GridViewPager")

Change-Id: Ic1a423b8be3dd7e52f61f109eb9f2cc549a5e311
2014-08-11 11:13:35 -04:00
Alan Lau
2d0d654104 Change setScrollVertically to protected to make scroll work in subclasses.
setScrollVertically is called by the animator and if it has no access to the
method in the subclass.  This will allow 3P app to extend the view.

Change-Id: I976355168fe1ed4e1f70b66aaab27ca16214dc05
2014-07-25 11:03:48 -07:00
Griff Hazen
7003893fce DO NOT MERGE Update version of sdk 20 samples to 2
To allow for a release of new API 20 samples.

Bug: 16158275

Change-Id: I459af267ec76271df10d93cf99439d40883d3a83
2014-07-22 15:01:22 -07:00
Deepanshu Gupta
9605eaa78b am fddc192f: am 7b9c13b5: am 292e62aa: am babc7880: am 38e59046: am dd0fcf2f: am 9f1005fd: am 84e3386e: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
* commit 'fddc192fc3f19d43eae63b242f488fc181b29ff3':
2014-07-18 23:06:36 +00:00
Deepanshu Gupta
fddc192fc3 am 7b9c13b5: am 292e62aa: am babc7880: am 38e59046: am dd0fcf2f: am 9f1005fd: am 84e3386e: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
* commit '7b9c13b5dcac9c3e800ab2feea323a20b8bc10b2':
2014-07-18 23:01:22 +00:00
Deepanshu Gupta
626baa07c8 am 1dcb4f05: am ae75543c: am 54c50b59: am d67beb9a: am dbea3d7d: am 53e1237a: am 8ae03adc: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
* commit '1dcb4f05dc21c5aa36d78469f74e39d1cb765b65':
  Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-18 23:01:07 +00:00
Deepanshu Gupta
1dcb4f05dc am ae75543c: am 54c50b59: am d67beb9a: am dbea3d7d: am 53e1237a: am 8ae03adc: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
* commit 'ae75543ce01ab673951516c8dbf313233a8c946a':
  Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-18 22:57:47 +00:00
Deepanshu Gupta
7b9c13b5dc am 292e62aa: am babc7880: am 38e59046: am dd0fcf2f: am 9f1005fd: am 84e3386e: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
* commit '292e62aa0d092de56c7b26e75a59beaa0f26fb4e':
2014-07-18 22:57:25 +00:00
Deepanshu Gupta
ae75543ce0 am 54c50b59: am d67beb9a: am dbea3d7d: am 53e1237a: am 8ae03adc: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
* commit '54c50b59d5539ec6096f89ef72a360f55f23a6f2':
  Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-18 22:53:44 +00:00
Deepanshu Gupta
292e62aa0d am babc7880: am 38e59046: am dd0fcf2f: am 9f1005fd: am 84e3386e: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
* commit 'babc7880785ea22074bd58dbf5b5144dd33521d7':
2014-07-18 22:52:25 +00:00
Deepanshu Gupta
54c50b59d5 am d67beb9a: am dbea3d7d: am 53e1237a: am 8ae03adc: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
* commit 'd67beb9aa9dfd4db1b12bcf932492acac221df04':
  Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-18 22:48:49 +00:00
Deepanshu Gupta
babc788078 am 38e59046: am dd0fcf2f: am 9f1005fd: am 84e3386e: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
* commit '38e59046d835fd6edb6eb333053a0c84fa4c02c9':
2014-07-18 22:48:17 +00:00
Deepanshu Gupta
d67beb9aa9 am dbea3d7d: am 53e1237a: am 8ae03adc: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
* commit 'dbea3d7d5eba6b149a08325036ab353eb385ef66':
  Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-18 22:44:43 +00:00
Deepanshu Gupta
38e59046d8 am dd0fcf2f: am 9f1005fd: am 84e3386e: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
* commit 'dd0fcf2f8386a7d7b1b9bb293ae689bd2489e0d9':
2014-07-18 22:43:11 +00:00
Deepanshu Gupta
dbea3d7d5e am 53e1237a: am 8ae03adc: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
* commit '53e1237a8edbad2de948f55b13df596853ae578f':
  Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-18 22:39:44 +00:00
Deepanshu Gupta
dd0fcf2f83 am 9f1005fd: am 84e3386e: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
* commit '9f1005fdbe41f842708884801f9c313cf87a0cde':
2014-07-18 22:38:42 +00:00
Deepanshu Gupta
53e1237a8e am 8ae03adc: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
* commit '8ae03adcc1ae490c6ef1ee79bb203201ab4e45a6':
  Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-18 22:35:08 +00:00
Deepanshu Gupta
9f1005fdbe am 84e3386e: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
* commit '84e3386eb261b45db60090c8cb8a7c8df0fa0660':
2014-07-18 22:34:54 +00:00
Deepanshu Gupta
8ae03adcc1 am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
* commit '5fff297a34f2699a64a055700da4d3411e7c7ca2':
  Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-18 22:31:44 +00:00
Deepanshu Gupta
84e3386eb2 am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
* commit '5fff297a34f2699a64a055700da4d3411e7c7ca2':
  Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-18 22:31:29 +00:00
Deepanshu Gupta
5fff297a34 am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
* commit 'e2ee1baff8f1c0275e28ad4ccd5018545933a6e3':
  Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-18 22:27:07 +00:00
Deepanshu Gupta
2cdeb60c3a am a2c022fa: am 5b6f4fc6: am a20f555a: (-s ours) am f5838d24: am f26c608b: am 197b278f: (-s ours) am 716666be: am a9078f4a: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
* commit 'a2c022fa211e62e2f2007ed35b3024b9792af1b3':
2014-07-18 22:20:18 +00:00
Deepanshu Gupta
591f5c8b14 am 1fa56bef: am 3271adb9: am 1b0b90c5: (-s ours) am 385f3bb6: am c5a8318a: am 5837c832: (-s ours) am a6da0ee8: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
* commit '1fa56befffded934f1101760a279b2ff8e55f655':
  Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-18 22:20:17 +00:00
Deepanshu Gupta
e2ee1baff8 resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
Change-Id: I8b4d344b4cf0004b377e0e9b08f3bbaf0a7641f0
2014-07-18 15:17:44 -07:00
Deepanshu Gupta
a2c022fa21 am 5b6f4fc6: am a20f555a: (-s ours) am f5838d24: am f26c608b: am 197b278f: (-s ours) am 716666be: am a9078f4a: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
* commit '5b6f4fc6e00c5a77691e0a413d83b29ec34ea59a':
2014-07-18 22:15:21 +00:00
Deepanshu Gupta
1fa56befff am 3271adb9: am 1b0b90c5: (-s ours) am 385f3bb6: am c5a8318a: am 5837c832: (-s ours) am a6da0ee8: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
* commit '3271adb9958beaf3d9651d6a6e1406731d12306f':
  Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-18 22:15:20 +00:00
Deepanshu Gupta
5b6f4fc6e0 am a20f555a: (-s ours) am f5838d24: am f26c608b: am 197b278f: (-s ours) am 716666be: am a9078f4a: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
* commit 'a20f555a255918ac0c6a366352dece8732232eb8':
2014-07-18 22:10:09 +00:00