Commit Graph

15542 Commits

Author SHA1 Message Date
bohu
e591d22bb0 am f8ac5e31: back port gles fix to api 17
* commit 'f8ac5e31789bf294f2969c2d08d902042d1a0420':
  back port gles fix to api 17
2015-02-13 20:22:37 +00:00
bohu
7bf71cfb09 Merge "Bump revision number for all system images" into jb-mr1.1-dev 2015-02-13 18:37:07 +00:00
bohu
a02de1bd4c Merge "Set revision number to 1 for system images" into lmp-mr1-dev 2015-02-13 18:33:36 +00:00
bohu
4c7a7e990d Bump revision number for all system images
We plan to release bug fix version of all system images, bump revision
number by 1.

Change-Id: I265c83cbdf0c67b45a4f48a2139edbe613558c0d
2015-02-12 17:13:16 -08:00
bohu
5e44138c09 Bump revision number for all the system images
We plan to release bug fix version of all system images, bump
the revision number by 1.

Change-Id: Ic1bc40c332ef732dd56b097ed171c9f81810db29
2015-02-12 17:09:11 -08:00
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
3f7c83fc84 Set revision number to 1 for system images
Since it is going be the first release of api 22 system images,
set it to be 1.

Change-Id: Ida92f6045e4dca2e31108d6c2d5e4a7b251ba81b
2015-02-12 16:15:50 -08:00
Xavier Ducrohet
e062193561 am 47ebdd97: am 2c47fd48: Update build-tools version. DO NOT MERGE.
* commit '47ebdd97527e7fdfca7c62b3569ae3a453afc2f4':
  Update build-tools version. DO NOT MERGE.
2015-02-05 21:56:04 +00:00
Xavier Ducrohet
47ebdd9752 am 2c47fd48: Update build-tools version. DO NOT MERGE.
* commit '2c47fd4871cf8bc8b731d3a9baa66849452c9361':
  Update build-tools version. DO NOT MERGE.
2015-02-05 21:49:17 +00: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
Xavier Ducrohet
2c47fd4871 Update build-tools version. DO NOT MERGE.
Change-Id: Ie67d2b1bdd739241e5f9b7c2ccf8dda5b06d17bc
2015-02-02 17:01:44 -08:00
Sam Hasinoff
02b19a182f Stop living in the past.
find docs/copyright-templates -type f | xargs sed -i 's/2013/2015/g'

Change-Id: I2e3cc83a82e556f7833331ef3e2ed1012d16044e
2015-01-26 10:31:15 -08:00
Deepanshu Gupta
c69ff83feb resolved conflicts for merge of 748fb34d to lmp-mr1-dev
Change-Id: I729cc4282ff2b65907fd8013de270bca514c6e83
2015-01-06 14:35:25 -08:00
Deepanshu Gupta
748fb34d04 am 8d10f2de: Update SDK Pkg revision for API 21 to 3 [DO NOT MERGE]
* commit '8d10f2debbe78961e4aaf1c44328750f30c7e48b':
  Update SDK Pkg revision for API 21 to 3 [DO NOT MERGE]
2015-01-05 23:33:20 +00:00
Deepanshu Gupta
8d10f2debb Update SDK Pkg revision for API 21 to 3 [DO NOT MERGE]
Added the do not merge tag so that it doesn't conflict with the version
number for the next API level.

Change-Id: Id9951894f845bdec2c6df9f923f9fbf67c9c2cfb
2014-12-31 00:20:56 +00:00
Deepanshu Gupta
fe3a0a924b Reset SDK Platform Pkg revision for API 22
Reset the SDK Platform and LayoutLib revision numbers for the new API
level.

Change-Id: I03104600edbc7f365eeedc29a9c80602abe3a3aa
2014-12-30 16:18:51 -08:00
Lorenzo Colitti
8501840869 Add a button to the debug app to call reportBadNetwork.
Bug: 18777225
Change-Id: I964f3deb60ea509dfb647a01d2b7b357dd47209b
2014-12-17 14:22:11 +09:00
Trevor Johns
3666bde1a2 am 011c1614: am 65c18817: am 20d72ce3: Increment lmp-docs samples to revision 5 (DO NOT MERGE)
* commit '011c16143323f1b6a5e3d0d3ac8659f48237b003':
  Increment lmp-docs samples to revision 5 (DO NOT MERGE)
2014-12-16 03:42:46 +00:00
Trevor Johns
23e2194cf9 am 2f3095d9: am cee6440c: am babfe028: Add new samples to sdk.atree
* commit '2f3095d93b5ef30d89ab3d939676f03918d76227':
  Add new samples to sdk.atree
2014-12-16 03:41:50 +00:00
Trevor Johns
011c161433 am 65c18817: am 20d72ce3: Increment lmp-docs samples to revision 5 (DO NOT MERGE)
* commit '65c1881776329fea22244908b9d41b5e78c664e9':
  Increment lmp-docs samples to revision 5 (DO NOT MERGE)
2014-12-13 03:08:36 +00:00
Trevor Johns
65c1881776 am 20d72ce3: Increment lmp-docs samples to revision 5 (DO NOT MERGE)
* commit '20d72ce3dbb2e22f0e83e433ead6af974750866d':
  Increment lmp-docs samples to revision 5 (DO NOT MERGE)
2014-12-13 02:59:19 +00:00
Trevor Johns
20d72ce3db Increment lmp-docs samples to revision 5 (DO NOT MERGE)
Change-Id: Iea7e17c19fea38dc0c57ec15839a07f5cb4d7193
2014-12-12 16:12:50 -08:00
Trevor Johns
2f3095d93b am cee6440c: am babfe028: Add new samples to sdk.atree
* commit 'cee6440c2ae07d53d382b2972a228d7d6651d2f5':
  Add new samples to sdk.atree
2014-12-12 21:38:58 +00:00
Trevor Johns
cee6440c2a am babfe028: Add new samples to sdk.atree
* commit 'babfe02866d84a457381a7d4c895596c8ec75165':
  Add new samples to sdk.atree
2014-12-12 21:32:14 +00:00
Dake Gu
0e5993dc2b Merge "Add test case for multiple row horizontal grid view" into lmp-mr1-dev 2014-12-11 23:18:45 +00:00
Trevor Johns
babfe02866 Add new samples to sdk.atree
- PermissionRequest
- DirectorySelection
- AppUsageStatistics
- ScreenCapture

Change-Id: I78d70f47dab54bc40a0e4e320ce6f8799b2cc785
2014-12-11 15:12:05 -08:00
Dake Gu
d17b2e78e8 Add test case for multiple row horizontal grid view
Add test case for update dataset at last row with empty space.

b/18631342
b/18718926

Change-Id: I3c745a41b0486cf293fc6a5a595e50f0a14ee0d0
2014-12-11 14:59:12 -08:00
Trevor Johns
b3493a5535 am 2452c088: am 82365c20: am abededd8: Docs: Sync browseable samples for lmp-docs
* commit '2452c0880d904d9e042e290b75acbe6f49b5208f':
  Docs: Sync browseable samples for lmp-docs
2014-12-10 03:52:56 +00:00
Trevor Johns
2452c0880d am 82365c20: am abededd8: Docs: Sync browseable samples for lmp-docs
* commit '82365c20f22bbc07d4b195ac13ab468022bd6f0d':
  Docs: Sync browseable samples for lmp-docs
2014-12-10 03:38:07 +00:00
Trevor Johns
82365c20f2 am abededd8: Docs: Sync browseable samples for lmp-docs
* commit 'abededd8f7014bb4af9e0e203b71633cd72e9c20':
  Docs: Sync browseable samples for lmp-docs
2014-12-10 03:28:17 +00:00
Trevor Johns
abededd8f7 Docs: Sync browseable samples for lmp-docs
Synced to developers/samples/android commit
bc036ecdf44cd03163c206096172299f3940b057.

Change-Id: Ib68230d79ca300e7db906aff2ebfc2cb6c6968f7
2014-12-09 18:49:04 -08:00
Dake Gu
2dbbfbbffa Merge "Add RowsFragment example" into lmp-mr1-dev 2014-12-09 23:19:34 +00:00
Dake Gu
72ae1d3818 Add RowsFragment example
Bug: 18622128
Change-Id: I12146a766fa383782f9917352c5959b6064835ee
2014-12-09 14:50:01 -08:00
Craig Stout
e2f3892fcb Merge "Add 'Remove all then re-add'." into lmp-mr1-dev 2014-12-09 00:34:22 +00:00
Craig Stout
1b6ad39042 Add 'Remove all then re-add'.
Change-Id: I57f06fab207bcf47c1fd089bf720f539aa389e7e
2014-12-08 16:09:31 -08:00
Xavier Ducrohet
032b355a13 am b0bedfe4: am 53c3c2e5: Update support extra version to 21.0.3 DO NOT MERGE.
* commit 'b0bedfe4b75af178609525834710a89137dca988':
  Update support extra version to 21.0.3 DO NOT MERGE.
2014-12-05 23:53:01 +00:00
Xavier Ducrohet
b0bedfe4b7 am 53c3c2e5: Update support extra version to 21.0.3 DO NOT MERGE.
* commit '53c3c2e56ee3ff234eb13362cfbf74203c9334d2':
  Update support extra version to 21.0.3 DO NOT MERGE.
2014-12-05 23:45:57 +00:00
Xavier Ducrohet
53c3c2e56e Update support extra version to 21.0.3 DO NOT MERGE.
Change-Id: Id78466d1ef53a303a53bf7b92ed1d290b1b55008
2014-12-05 15:38:39 -08:00
RoboErik
4424852bbb Updates for compatLib changes to MedaiRouter support lib
The ControllerDialog in MediaRouter now gets the session token from
the MediaRouter instead of needing it to be set. Removed the calls to
set it directly on the dialog.

bug:18186638
Change-Id: If7499108c226d3405ea70e2f332694a92a921e50
2014-12-04 13:51:26 -08:00
Deepanshu Gupta
154cfd7a55 am 7dd11bd0: am ca15c415: Merge "Add tzdata to SDK build" into lmp-dev
* commit '7dd11bd0664f7e43c049eba632e390451ddeb64d':
  Add tzdata to SDK build
2014-12-04 02:56:53 +00:00
Craig Stout
f48581698c Use non-deprecated HeaderItem constructor.
b/17455376

Change-Id: I9fff76367ffe1f96642a39962e51c935cf39d10b
2014-12-03 17:11:57 -08:00
Deepanshu Gupta
7dd11bd066 am ca15c415: Merge "Add tzdata to SDK build" into lmp-dev
* commit 'ca15c4153285d2eb587b0d026c47f57ff36d2fe1':
  Add tzdata to SDK build
2014-12-03 20:58:16 +00:00
Deepanshu Gupta
ca15c41532 Merge "Add tzdata to SDK build" into lmp-dev 2014-12-03 20:48:30 +00:00
RoboErik
d7e30037aa Merge "Update for MediaSessionCompat support" into lmp-mr1-dev 2014-12-03 19:06:05 +00:00
Michael Wright
2503a62bc3 Merge "Have the MediaProjection sample use the callback." into lmp-mr1-dev 2014-12-03 01:18:26 +00:00
Trevor Johns
22ca6ce44e am 15af151e: am f20b9979: am 1ccf8350: DO NOT MERGE: Update revision number for Android Samples package (lmp-docs)
* commit '15af151e05bc642b6cc11c42b73fe6edb9552e39':
  DO NOT MERGE: Update revision number for Android Samples package (lmp-docs)
2014-12-01 23:13:32 +00:00
RoboErik
e98a5d4e19 Update for MediaSessionCompat support
Switches the MediaRouter sample to using MediaSessionCompat instead of
RemoteControlClient. This goes along with the update to the support lib
for full MediaSessionCompat support of RCC.

bug:18186638
Change-Id: If8dd25346b850512ea8d248012d8a369a39d301f
2014-12-01 15:11:20 -08:00
Trevor Johns
15af151e05 am f20b9979: am 1ccf8350: DO NOT MERGE: Update revision number for Android Samples package (lmp-docs)
* commit 'f20b99791584d7b1291e98b9ed9705b3517605b9':
  DO NOT MERGE: Update revision number for Android Samples package (lmp-docs)
2014-12-01 23:07:53 +00:00
Trevor Johns
f20b997915 am 1ccf8350: DO NOT MERGE: Update revision number for Android Samples package (lmp-docs)
* commit '1ccf8350d52bd8d7f480c2c4d46c666356f4a220':
  DO NOT MERGE: Update revision number for Android Samples package (lmp-docs)
2014-12-01 23:01:41 +00:00
Trevor Johns
1ccf8350d5 DO NOT MERGE: Update revision number for Android Samples package (lmp-docs)
Setting revision for Coral samples release to r4.

Change-Id: I6096fe36f7fbaa589919ecd0edfcc000ffd4264a
2014-12-01 14:52:57 -08:00