Permalink
Commits on Jan 13, 2012
  1. Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"

    Jean-Baptiste Queru committed with android code review Jan 13, 2012
Commits on Jan 12, 2012
  1. stagefright aacenc/amrwbenc: Remove trailing whitespace

    This was applied in AOSP master earlier, in commit
    b21611e, but when merged
    into the Google internal tree in
    88c2d4d, none of these
    changes have been brought in. (The diff of this merge commit
    and its first parent, d94b71d, is empty.)
    
    Therefore, reapply the rest of these changes on the files
    that still are present in the current version.
    
    Change-Id: I645a9b9134769958a11808a06163123d28d83e46
    mansr committed with mstorsjo Apr 5, 2011
Commits on Jan 11, 2012
  1. Fix Apache stack

    Change-Id: Iec7d0d8bdaaa5594fa7412db79943ab0ccdf594c
    John Reck committed with Jean-Baptiste Queru Jan 4, 2012
Commits on Dec 16, 2011
  1. Reconcile with ics-mr1-release

    Change-Id: Ib2cbd92ed2d3567e22921b66ca2202a968fdd0da
    The Android Open Source Project committed Dec 16, 2011
  2. am 8b6ed2d: Doc change: edits to ICS MR1 API Overview.

    * commit '8b6ed2d17d5e7e47944026679c9cba66611ab27f':
      Doc change: edits to ICS MR1 API Overview.
    ddougherty committed with Android Git Automerger Dec 16, 2011
  3. Doc change: edits to ICS MR1 API Overview.

    Change-Id: Idb18e3085b3dd54c9a39e74c37428c3d5b28aa83
    ddougherty committed Dec 16, 2011
  4. am 5b18c71: Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0…

    ….1, Support lib r5-r6" into ics-mr1
    
    * commit '5b18c714bbff269d7db880b42de34fd1385da9f9':
      docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
    Joe Fernandez committed with Android Git Automerger Dec 16, 2011
  5. Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support …

    …lib r5-r6" into ics-mr1
    Joe Fernandez committed with Android (Google) Code Review Dec 16, 2011
  6. docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6

    Change-Id: I628cd076cd37f6252837de276c4b7a9040c37bc1
    Joe Fernandez committed Dec 16, 2011
  7. am 14633f1: am 48e0617: Fixed Android U Enterprise lesson pre-requisi…

    …tes and a minor typo.
    
    * commit '14633f1b1eea585cdc094ebae75708db2293fe56':
      Fixed Android U Enterprise lesson pre-requisites and a minor typo.
    Fred Chung committed with Android Git Automerger Dec 16, 2011
  8. am 48e0617: Fixed Android U Enterprise lesson pre-requisites and a mi…

    …nor typo.
    
    * commit '48e0617b9e7d06da803c572d6584d68898733d37':
      Fixed Android U Enterprise lesson pre-requisites and a minor typo.
    Fred Chung committed with Android Git Automerger Dec 16, 2011
  9. Fixed Android U Enterprise lesson pre-requisites and a minor typo.

    Change-Id: Ide393a0957f3e797f14d7c349c35337849b15f02
    Fred Chung committed Dec 16, 2011
  10. am 8e980c1: Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1,…

    … Support lib r5-r6" into ics-mr1
    
    * commit '8e980c1e4e86cb4c7ea679eba3cc01d64e323b26':
      docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
    scottamain committed with Android Git Automerger Dec 16, 2011
  11. Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib…

    … r5-r6" into ics-mr1
    scottamain committed with Android (Google) Code Review Dec 16, 2011
  12. am 36c6778: docs: update homepage for 4.0.3 announcment

    * commit '36c677855c0a54ede9e92aa856cb2250960e922e':
      docs: update homepage for 4.0.3 announcment
    scottamain committed with Android Git Automerger Dec 16, 2011
  13. docs: update homepage for 4.0.3 announcment

    Change-Id: I54d1d447ac224982f4483afede2087ce18937ed0
    scottamain committed Dec 16, 2011
  14. SurfaceMediaSource: use the HW_TEXTURE usage bit

    This change makes SurfaceMediaSource request Gralloc buffers with the
    HW_TEXTURE usage bit rather than the VIDEO_ENCODER bit.  It is a
    temporary workaround for what is likely a Gralloc bug.
    
    Bug: 5771063
    Change-Id: I9cce615e80fc14a1644fae27ba06970c262dd179
    Jamie Gennis committed with The Android Automerger Dec 16, 2011
  15. merge in ics-mr1-release history after reset to ics-mr1

    The Android Automerger committed Dec 16, 2011
  16. am 4cb7d09: am 98af5ed: docs: fix encoding issue or whatever with doc…

    …s (not showing titles)
    
    * commit '4cb7d0953534587ba2051c6536fdde4b2c9539d5':
      docs: fix encoding issue or whatever with docs (not showing titles)
    scottamain committed with Android Git Automerger Dec 16, 2011
  17. am 98af5ed: docs: fix encoding issue or whatever with docs (not showi…

    …ng titles)
    
    * commit '98af5edc70b0b418366f5197b9aeef30f135d40e':
      docs: fix encoding issue or whatever with docs (not showing titles)
    scottamain committed with Android Git Automerger Dec 16, 2011
  18. SurfaceMediaSource: use the HW_TEXTURE usage bit

    This change makes SurfaceMediaSource request Gralloc buffers with the
    HW_TEXTURE usage bit rather than the VIDEO_ENCODER bit.  It is a
    temporary workaround for what is likely a Gralloc bug.
    
    Bug: 5771063
    Change-Id: I9cce615e80fc14a1644fae27ba06970c262dd179
    Jamie Gennis committed with The Android Automerger Dec 16, 2011
  19. docs: fix encoding issue or whatever with docs (not showing titles)

    Change-Id: Iac9afc3aa36e86d2f8defc8a7252864c23ecc23b
    scottamain committed Dec 16, 2011
  20. am 8f266b9: am d9bc2d2: Merge "docs: add remembering users class to n…

    …av" into ics-mr0
    
    * commit '8f266b9e348ba69d953568624b8d0e2cea07f99d':
      docs: add remembering users class to nav
    scottamain committed with Android Git Automerger Dec 16, 2011
  21. am d9bc2d2: Merge "docs: add remembering users class to nav" into ics…

    …-mr0
    
    * commit 'd9bc2d21c55e58f83e4209749cc51f0da9869b54':
      docs: add remembering users class to nav
    scottamain committed with Android Git Automerger Dec 16, 2011
  22. Merge "docs: add remembering users class to nav" into ics-mr0

    scottamain committed with Android (Google) Code Review Dec 16, 2011
  23. am 26e461b: am 5dac197: Merge "Doc merge from master:Training class o…

    …n Identifying and Authenticating Users." into ics-mr0
    
    * commit '26e461b34f5f9eef79aa30f1304cca4262ff88ed':
      Doc merge from master:Training class on Identifying and Authenticating Users.
    scottamain committed with Android Git Automerger Dec 16, 2011
  24. am 5dac197: Merge "Doc merge from master:Training class on Identifyin…

    …g and Authenticating Users." into ics-mr0
    
    * commit '5dac1976198e5fa553749cd145c7484f3ff45c6b':
      Doc merge from master:Training class on Identifying and Authenticating Users.
    scottamain committed with Android Git Automerger Dec 16, 2011
  25. docs: add remembering users class to nav

    Change-Id: Iedfd5c6580dd2d23df1eaf4da6cf43d77b5866f8
    scottamain committed Dec 16, 2011
  26. Merge "Doc merge from master:Training class on Identifying and Authen…

    …ticating Users." into ics-mr0
    scottamain committed with Android (Google) Code Review Dec 16, 2011
  27. am ce5643c: am abfcbd1: docs: typo in training orientation

    * commit 'ce5643c7c43c2c680e683c56507ffa1bf5b9a316':
      docs: typo in training orientation
    scottamain committed with Android Git Automerger Dec 16, 2011
  28. am abfcbd1: docs: typo in training orientation

    * commit 'abfcbd162ff0f3baf45436614a1ea7ce6c032df1':
      docs: typo in training orientation
    scottamain committed with Android Git Automerger Dec 16, 2011
  29. Doc merge from master:Training class on Identifying and Authenticatin…

    …g Users.
    
    Conflicts:
    
    	docs/html/training/id-auth/authenticate.jd
    	docs/html/training/id-auth/custom_auth.jd
    	docs/html/training/id-auth/identify.jd
    	docs/html/training/id-auth/index.jd
    
    Change-Id: I73174b2cb923ec5d28b551f27d0512d427616c69
    ddougherty committed with IanNiLewis Dec 15, 2011
  30. docs: typo in training orientation

    Change-Id: I9535713d7784146e96df5b347f2be38628ce7d2c
    scottamain committed Dec 16, 2011
  31. am 1584a81: am 408f94b: Merge "docs: Minor bugfix to Android U naviga…

    …tion design class" into ics-mr0
    
    * commit '1584a816ed2e431ae804954dc6bd2d9dc79a540e':
      docs: Minor bugfix to Android U navigation design class
    Roman Nurik committed with Android Git Automerger Dec 16, 2011
  32. am 408f94b: Merge "docs: Minor bugfix to Android U navigation design …

    …class" into ics-mr0
    
    * commit '408f94b1478c62f953faf29b02c3af5d8d3c5e05':
      docs: Minor bugfix to Android U navigation design class
    Roman Nurik committed with Android Git Automerger Dec 16, 2011