summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 51884f0e: am 499126c4: Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant."Alex Klyubin2015-04-162-3/+13
|\
| * am 499126c4: Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant."Alex Klyubin2015-04-162-3/+13
| |\
| | * Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant."Alex Klyubin2015-04-162-3/+13
| | |\
| | | * Add Keymaster KM_ORIGIN_UNKNOWN constant.Alex Klyubin2015-04-142-3/+13
* | | | am c4affce9: am 1f3c7f3f: am f18ceefc: am cd6e00c6: Merge changes from topic ...Deepanshu Gupta2015-04-1618-164/+224
|\ \ \ \ | |/ / /
| * | | am 1f3c7f3f: am f18ceefc: am cd6e00c6: Merge changes from topic \'layoutlib-a...Deepanshu Gupta2015-04-1618-164/+224
| |\ \ \
| | * \ \ am f18ceefc: am cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into ...Deepanshu Gupta2015-04-1618-164/+224
| | |\ \ \
| | | * \ \ am cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into lmp-mr1-devDeepanshu Gupta2015-04-1618-164/+224
| | | |\ \ \
| | | | * \ \ Merge changes from topic 'layoutlib-api-15' into lmp-mr1-devDeepanshu Gupta2015-04-1618-164/+224
| | | | |\ \ \
| | | | | * | | Update golden image for tests.Deepanshu Gupta2015-04-151-0/+0
| | | | | * | | Update to using LayoutlibCallback.Deepanshu Gupta2015-04-1517-154/+190
| | | | | * | | Remove implementation of deprecated method.Deepanshu Gupta2015-04-152-7/+3
| | | | | * | | Add @empty support.Deepanshu Gupta2015-04-151-3/+31
* | | | | | | | am 40955edf: am 14a982aa: Merge "Document hprof-conv -z"Brian Carlstrom2015-04-161-1/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 14a982aa: Merge "Document hprof-conv -z"Brian Carlstrom2015-04-161-1/+5
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Merge "Document hprof-conv -z"Brian Carlstrom2015-04-161-1/+5
| | |\ \ \ \ \ \
| | | * | | | | | Document hprof-conv -zBrian Carlstrom2015-04-161-1/+5
| | |/ / / / / /
* | | | | | | | am a2607ee4: am b9a78c79: Merge "Add IV-related Keymaster error codes."Alex Klyubin2015-04-161-0/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am b9a78c79: Merge "Add IV-related Keymaster error codes."Alex Klyubin2015-04-161-0/+4
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Add IV-related Keymaster error codes."Alex Klyubin2015-04-161-0/+4
| | |\ \ \ \ \ \
| | | * | | | | | Add IV-related Keymaster error codes.Alex Klyubin2015-04-151-0/+4
* | | | | | | | | am 28a9089f: am 216d18b9: Merge "Remove IV auto-generation workaround."Alex Klyubin2015-04-161-12/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 216d18b9: Merge "Remove IV auto-generation workaround."Alex Klyubin2015-04-161-12/+6
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Remove IV auto-generation workaround."Alex Klyubin2015-04-161-12/+6
| | |\ \ \ \ \ \ \
| | | * | | | | | | Remove IV auto-generation workaround.Alex Klyubin2015-04-151-12/+6
| | | |/ / / / / /
* | | | | | | | | am 2b300a99: am 782b4339: Merge "[RenderScript] typo fix in Allocation.java"Miao Wang2015-04-161-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 782b4339: Merge "[RenderScript] typo fix in Allocation.java"Miao Wang2015-04-161-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "[RenderScript] typo fix in Allocation.java"Miao Wang2015-04-161-1/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | [RenderScript] typo fix in Allocation.javaMiao Wang2015-04-151-1/+1
* | | | | | | | | am 91d2f27b: am 7f72f747: Merge "Add BNNM intrinsic."Tim Murray2015-04-153-0/+60
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 7f72f747: Merge "Add BNNM intrinsic."Tim Murray2015-04-153-0/+60
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Add BNNM intrinsic."Tim Murray2015-04-153-0/+60
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Add BNNM intrinsic.Tim Murray2015-04-143-0/+60
* | | | | | | | | am 1cb119d3: am 71ba4e46: Merge "Unbreak obtaining symmetric keys from Androi...Shawn Willden2015-04-151-5/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 71ba4e46: Merge "Unbreak obtaining symmetric keys from AndroidKeyStore."Shawn Willden2015-04-151-5/+10
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Unbreak obtaining symmetric keys from AndroidKeyStore."Shawn Willden2015-04-151-5/+10
| | |\ \ \ \ \ \ \
| | | * | | | | | | Unbreak obtaining symmetric keys from AndroidKeyStore.Alex Klyubin2015-04-141-5/+10
* | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-04-152-3/+3
* | | | | | | | | | am 99e23088: am 150e0e87: Merge "fix return value scale of notifyANR()"Michael Wright2015-04-151-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 150e0e87: Merge "fix return value scale of notifyANR()"Michael Wright2015-04-151-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "fix return value scale of notifyANR()"Michael Wright2015-04-151-1/+1
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | fix return value scale of notifyANR()baik.han2015-04-151-1/+1
| | | |/ / / / / / /
* | | | | | | | | | am 895f3c27: am 6a47a861: Merge "Add getPrefixAids()."Martijn Coenen2015-04-151-1/+14
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 6a47a861: Merge "Add getPrefixAids()."Martijn Coenen2015-04-151-1/+14
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "Add getPrefixAids()."Martijn Coenen2015-04-151-1/+14
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | Add getPrefixAids().Martijn Coenen2015-04-151-1/+14
* | | | | | | | | | am e635f9b5: am 726466c2: am 11002022: am 5b6e91a6: am af5f2000: Merge "docs:...Joe Fernandez2015-04-1528-46/+380
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 726466c2: am 11002022: am 5b6e91a6: am af5f2000: Merge "docs: Add Cross-Re...Joe Fernandez2015-04-1528-46/+380
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | am 11002022: am 5b6e91a6: am af5f2000: Merge "docs: Add Cross-References to M...Joe Fernandez2015-04-1528-46/+380
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | |
| | | * | | | | | | am 5b6e91a6: am af5f2000: Merge "docs: Add Cross-References to Material Desig...Joe Fernandez2015-04-1428-46/+380
| | | |\ \ \ \ \ \ \ | | | | | |_|_|/ / / | | | | |/| | | | |