OSDN Git Service
Joe Fernandez [Wed, 8 Oct 2014 14:45:59 +0000 (14:45 +0000)]
am
bcd1af39: Merge "docs: Wear UI Lib training fixes" into klp-modular-docs
* commit '
bcd1af39fa674dcc46ddb30778304eaf67100a13':
docs: Wear UI Lib training fixes
Joe Fernandez [Wed, 8 Oct 2014 14:37:34 +0000 (14:37 +0000)]
Merge "docs: Wear UI Lib training fixes" into klp-modular-docs
Deepanshu Gupta [Sat, 2 Aug 2014 20:16:24 +0000 (13:16 -0700)]
LayoutLib: Use ICU's line break algo. [DO NOT MERGE]
Change-Id: I7e5b0ab7423a72f5a4b0e1163d0a537f0b03ba07
(cherry picked from commit
760f6394d0f65fbb5365186e8e068d53c506b653)
Rich Slogar [Wed, 8 Oct 2014 00:34:38 +0000 (00:34 +0000)]
am
6af8fc7f: Merge "docs:64 bit image and skd update" into klp-modular-docs
* commit '
6af8fc7f89cb5dec15c23ee04c271188ff11138d':
docs:64 bit image and skd update
Rich Slogar [Wed, 8 Oct 2014 00:31:42 +0000 (00:31 +0000)]
Merge "docs:64 bit image and skd update" into klp-modular-docs
Quddus Chong [Tue, 7 Oct 2014 23:33:10 +0000 (23:33 +0000)]
am
8730092a: Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs
* commit '
8730092af798d27b9e9a9a4ba00cef0d3ebea55f':
docs: Added API highlights for Google Play services 6.1 (Manchego).
Quddus Chong [Tue, 7 Oct 2014 23:33:03 +0000 (23:33 +0000)]
am
6628e602: Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs
* commit '
6628e602fb616355db8272a697a7004d91f485b8':
Updataed Google Play services Javadocs for v6.1 (Manchego) release.
Quddus Chong [Tue, 7 Oct 2014 23:27:01 +0000 (23:27 +0000)]
Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs
Quddus Chong [Tue, 7 Oct 2014 23:26:48 +0000 (23:26 +0000)]
Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs
Rich Slogar [Tue, 7 Oct 2014 18:06:07 +0000 (11:06 -0700)]
docs:64 bit image and skd update
Change-Id: I53d3d8e8714cb4689ba80766b155fb1b3ea93484
Ricardo Cervera [Tue, 7 Oct 2014 18:38:24 +0000 (18:38 +0000)]
am
bd964cad: docs: Removing references to self note on Common Intents page.
* commit '
bd964cadd4846d5d954eadb7fcd2a61e51814c65':
docs: Removing references to self note on Common Intents page.
Ricardo Cervera [Tue, 7 Oct 2014 17:37:19 +0000 (10:37 -0700)]
docs: Removing references to self note on Common Intents page.
Change-Id: Ia1324f2363ce66ad0019946605a6a74a4cd28ecc
Ricardo Cervera [Tue, 7 Oct 2014 04:49:17 +0000 (04:49 +0000)]
am
3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs
* commit '
3f7b4d8ff385ce30c6c266f8b0418fc621db2da8':
docs: Update Common Intents page with Google Now actions
Ricardo Cervera [Tue, 7 Oct 2014 04:41:12 +0000 (04:41 +0000)]
Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs
Ricardo Cervera [Tue, 30 Sep 2014 16:55:48 +0000 (09:55 -0700)]
docs: Update Common Intents page with Google Now actions
Change-Id: I474539d37791b16df693193bcdaee4e2161a2612
Quddus Chong [Sat, 4 Oct 2014 01:30:43 +0000 (01:30 +0000)]
am
ba2199fa: Merge "docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API." into klp-modular-docs
* commit '
ba2199fa8c369d9627a216a4c3ea19497bf9e9c7':
docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API.
Quddus Chong [Sat, 4 Oct 2014 01:20:12 +0000 (01:20 +0000)]
Merge "docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API." into klp-modular-docs
Ricardo Cervera [Sat, 4 Oct 2014 00:01:21 +0000 (00:01 +0000)]
am
2a02b881: Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs
* commit '
2a02b8813bd6bfd3d36cca6e5e3a3ff6a868d881':
docs: Training class for the Wearable UI Library
Rich Slogar [Sat, 4 Oct 2014 00:01:17 +0000 (00:01 +0000)]
am
83d5c9bf: docs:change required ADT version to 23.0.2
* commit '
83d5c9bfbd75831375009e21989de40368afc04a':
docs:change required ADT version to 23.0.2
Ricardo Cervera [Fri, 3 Oct 2014 23:43:25 +0000 (16:43 -0700)]
docs: Wear UI Lib training fixes
Change-Id: I8d4610b68218455b8a00a34a101cee1f0d945633
Ricardo Cervera [Fri, 3 Oct 2014 23:25:23 +0000 (23:25 +0000)]
Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs
smain@google.com [Fri, 3 Oct 2014 22:13:14 +0000 (22:13 +0000)]
am
cef9aab6: Merge "make sdk download links use HTTPS bug:
8033954" into klp-modular-docs
* commit '
cef9aab68ec45340186261d39ded6261ba1c5966':
make sdk download links use HTTPS bug:
8033954
Rich Slogar [Fri, 3 Oct 2014 22:12:17 +0000 (15:12 -0700)]
docs:change required ADT version to 23.0.2
Change-Id: I6312cd45df94a89f2812aa3c53e2974f6cfbb0ed
smain@google.com [Fri, 3 Oct 2014 22:06:43 +0000 (22:06 +0000)]
Merge "make sdk download links use HTTPS bug:
8033954" into klp-modular-docs
Quddus Chong [Thu, 11 Sep 2014 23:50:09 +0000 (16:50 -0700)]
docs: Modified the notice in the android.location package file to strongly
encourage developers to migrate to the Google Play Services Location API.
Change-Id: I9c2602daa7198eca38841582865c6a973f5acec8
Ricardo Cervera [Fri, 3 Oct 2014 18:00:37 +0000 (18:00 +0000)]
am
d37afa37: Merge "docs: Unbuntu troubleshooting link to CamelCase ID" into klp-modular-docs
* commit '
d37afa37452d5e5dab3704ecab0ab7cebb3da292':
docs: Unbuntu troubleshooting link to CamelCase ID
Ricardo Cervera [Fri, 3 Oct 2014 17:55:34 +0000 (17:55 +0000)]
Merge "docs: Unbuntu troubleshooting link to CamelCase ID" into klp-modular-docs
Ricardo Cervera [Fri, 3 Oct 2014 16:44:25 +0000 (09:44 -0700)]
docs: Unbuntu troubleshooting link to CamelCase ID
Change-Id: I705d17346c470563c350df9bb17d23f3fda5fbc5
Rich Slogar [Thu, 2 Oct 2014 22:47:15 +0000 (22:47 +0000)]
am
c470faab: docs:ADT 23.0.4 doc updates
* commit '
c470faab3ee47b5643ee6b0a97c925c8f0f587fa':
docs:ADT 23.0.4 doc updates
Rich Slogar [Thu, 2 Oct 2014 22:13:09 +0000 (15:13 -0700)]
docs:ADT 23.0.4 doc updates
Change-Id: Ibf412802e7c98ed3beff6c61394f1b3962254d9a
Ricardo Cervera [Fri, 26 Sep 2014 20:00:34 +0000 (13:00 -0700)]
docs: Training class for the Wearable UI Library
Change-Id: I93e9f6fc407f9afa79ce9af43d90719eb526bffa
Joe Fernandez [Thu, 2 Oct 2014 21:14:59 +0000 (21:14 +0000)]
am
e961d0b5: Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs
* commit '
e961d0b521bc25caf964258e75fef3d3ea22e4ac':
Revert "docs: Update for Android 23.0.4"
Joe Fernandez [Thu, 2 Oct 2014 21:08:27 +0000 (21:08 +0000)]
Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs
Joe Fernandez [Thu, 2 Oct 2014 21:07:49 +0000 (21:07 +0000)]
Revert "docs: Update for Android 23.0.4"
This reverts commit
f34d0e69033165b7a6e9c73b99f4ef6ac36b3896.
Change-Id: I4d521392733f1b028c72d4623d6d69a4c5910bc4
Ricardo Cervera [Thu, 2 Oct 2014 18:07:53 +0000 (18:07 +0000)]
am
680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs
* commit '
680092c5987e701043ff0fa0d2c5390e829412c0':
docs: Provide direct link to Ubuntu troubleshooting.
Ricardo Cervera [Thu, 2 Oct 2014 18:04:41 +0000 (18:04 +0000)]
Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs
Ricardo Cervera [Thu, 2 Oct 2014 01:32:42 +0000 (18:32 -0700)]
docs: Provide direct link to Ubuntu troubleshooting.
Change-Id: I6a9f8c3f3ef01abcfdaf95730139156ba443a4be
Rich Slogar [Thu, 2 Oct 2014 17:38:35 +0000 (17:38 +0000)]
am
c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs
* commit '
c074c3a4074791ae1270e3177e2299f31b9bb5a1':
docs: Update for Android 23.0.4
Rich Slogar [Thu, 2 Oct 2014 17:31:04 +0000 (17:31 +0000)]
Merge "docs: Update for Android 23.0.4" into klp-modular-docs
Rich Slogar [Wed, 1 Oct 2014 18:37:18 +0000 (11:37 -0700)]
docs: Update for Android 23.0.4
Change-Id: I7025dcf9bbfd03b555f7f5059d0e35f67f836dcf
Deepanshu Gupta [Thu, 2 Oct 2014 03:32:27 +0000 (03:32 +0000)]
Merge "Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:48 +0000 (03:26 +0000)]
Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:43 +0000 (03:26 +0000)]
Merge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:37 +0000 (03:26 +0000)]
Merge "Update intelliJ copyright profile [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:31 +0000 (03:26 +0000)]
Merge "Build layoutlib create tests as part of sdk build. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:21 +0000 (03:26 +0000)]
Merge "Add layoutlib tests to DIST_DIR [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:04 +0000 (03:26 +0000)]
Merge "Build layoutlib_create tests. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:02 +0000 (03:26 +0000)]
Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:25:42 +0000 (03:25 +0000)]
Merge "Get filename from File faster [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:25:36 +0000 (03:25 +0000)]
Merge "Add testing framework to LayoutLib. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:25:31 +0000 (03:25 +0000)]
Merge "Add tests to the layoutlib eclipse project. [DO NOT MERGE]" into klp-modular-dev
Jeff Hao [Fri, 28 Mar 2014 18:33:53 +0000 (11:33 -0700)]
Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]
Needed to bypass new access checks for fields, methods, and
constructors.
Change-Id: I8ff0b44a6cb4f4af1c72734bca366d8b89528030
(cherry picked from commit
e3abd2ccbef4c50b48df3605c65d732fa49a980b)
Deepanshu Gupta [Fri, 19 Sep 2014 21:29:02 +0000 (14:29 -0700)]
Resource resolution bug fix. [DO NOT MERGE]
Fix a bug where "?attr/foo" in framework resources wasn't resolved
properly.
Change-Id: I9a56974f526774fde79685f668f01021136d68f1
(cherry picked from commit
19c7842082d831ad432abe906f4c37c6ed08e414)
Deepanshu Gupta [Fri, 19 Sep 2014 18:48:58 +0000 (11:48 -0700)]
Fix Tests after cherry picks. [DO NOT MERGE]
1. Updated the intelliJ run configuration for the layoutlib_create tool.
2. Updated the code to search for the platform.dir.
3. Update tests to use AppTheme and Target SDK 19
Change-Id: I6f1cc6ff2a53e4474c746537029c7f89c6dd6dc1
(cherry picked from commit
8592eeafd01370d1a17e34602290becf7f611c75)
Deepanshu Gupta [Wed, 13 Aug 2014 19:30:40 +0000 (12:30 -0700)]
Update intelliJ copyright profile [DO NOT MERGE]
Change-Id: Ib9386b686cb24e1f187d0b636b59b4b13d59bbcd
(cherry picked from commit
91fa62ac67a5e294124b5bfb70b35addc7687c34)
Deepanshu Gupta [Tue, 9 Sep 2014 01:38:57 +0000 (18:38 -0700)]
Build layoutlib create tests as part of sdk build. [DO NOT MERGE]
LayoutLib Create tests are now built whenever LayoutLib create is built.
Change-Id: Id215e8690e435019579dba1734090a0d585f37e1
(cherry picked from commit
4efe6264f1251fa200427f54ea6f5dd4c4d03665)
Deepanshu Gupta [Fri, 5 Sep 2014 02:07:40 +0000 (19:07 -0700)]
Add layoutlib tests to DIST_DIR [DO NOT MERGE]
Add the layoutlib and layoutlib-create tests to DIST_DIR for sdk
targets. These can be used for continuous testing on the build server.
Change-Id: I747dddcddfd8009937668bec4d75cb99bf63235f
(cherry picked from commit
f9c749c9901c459f77ffc6f4fbbc15f4142c6e0a)
Deepanshu Gupta [Wed, 3 Sep 2014 19:57:12 +0000 (12:57 -0700)]
Build layoutlib_create tests. [DO NOT MERGE]
Change-Id: Ia13a090f8ec29b2b2a107825b6a13d7db77e6d61
(cherry picked from commit
2294f939bc79ce902a40db37def64cc28394d56b)
Deepanshu Gupta [Mon, 25 Aug 2014 18:49:02 +0000 (11:49 -0700)]
Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]
The variable is not actually needed and it makes working with different
API levels a lot easier since everything now depends on $PROJECT_DIR$.
This change also makes the tests more robust by improving the way it
tries to find the SDK.
Change-Id: I3502ad4a0ba85fd88b497e47964fddb2a89e520c
(cherry picked from commit
5377695d4ecf3cc6dc1abe59bbfca63f6137b722)
Deepanshu Gupta [Mon, 4 Aug 2014 21:01:07 +0000 (14:01 -0700)]
Get filename from File faster [DO NOT MERGE]
Use the direct call from a File object to get the filename instead of
going through Path which depends on Java 7 making the LayoutLib tests
incompatible with Java 6.
Change-Id: I815895eedbc10245ee09bdb53b11e5548b076aad
(cherry picked from commit
7dbf91fee96790fbeb9858740be1bb375f29ecb5)
Deepanshu Gupta [Thu, 31 Jul 2014 18:32:25 +0000 (11:32 -0700)]
Add testing framework to LayoutLib. [DO NOT MERGE]
This change adds an end to end test which loads the framework resources
and a test app and ensures that no exceptions or warnings are thrown.
The change also adds project configuration for intelliJ.
Change-Id: I7b67c0f1a2af2dac95df7f3231cab537b9826d7d
(cherry picked from commit
a8e9517470869fa29946ae1fa1ceeb24c7970391)
Deepanshu Gupta [Thu, 27 Feb 2014 19:51:50 +0000 (11:51 -0800)]
Add tests to the layoutlib eclipse project. [DO NOT MERGE]
Specify the test folder in the layoutlib/bridge eclipse project.
Also add the sourcepath for layoutlib-api-prebuilt.jar
Change-Id: I194ed182618e564388d6df645e2de7f59897fa1e
(cherry picked from commit
36acf8baebc9ab72b3b5fe75d865399ddf7b0132)
Justin Koh [Wed, 1 Oct 2014 17:57:58 +0000 (17:57 +0000)]
Merge "DO NOT MERGE Hide the volume panel for watches for now" into klp-modular-dev
Justin Koh [Wed, 1 Oct 2014 17:42:33 +0000 (10:42 -0700)]
DO NOT MERGE Hide the volume panel for watches for now
Hide the volume panel: it's not usable. Need new design in a future release.
Bug:
17753651
Change-Id: I6f7b0683908407b2c1457379cc6641d25adc5c83
kmccormick [Wed, 1 Oct 2014 17:08:13 +0000 (17:08 +0000)]
am
a1572ffc: Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs
* commit '
a1572ffc6b8df1f0da637fdb93b949322fcb3637':
Doc update: Update preprod (staging) instructions.
kmccormick [Wed, 1 Oct 2014 17:02:25 +0000 (17:02 +0000)]
Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs
Ricardo Cervera [Wed, 1 Oct 2014 02:57:29 +0000 (02:57 +0000)]
am
ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs
* commit '
ae7b5dc49381e76c82cda928cc37a6a8b529da25':
docs: ADT beginner text fix
Ricardo Cervera [Wed, 1 Oct 2014 02:07:14 +0000 (02:07 +0000)]
Merge "docs: ADT beginner text fix" into klp-modular-docs
Ricardo Cervera [Tue, 30 Sep 2014 22:07:16 +0000 (15:07 -0700)]
docs: ADT beginner text fix
Change-Id: I03cc08d5a4f12137a573c23d1ee07e048225c8f5
kmccormick [Wed, 24 Sep 2014 00:08:33 +0000 (17:08 -0700)]
Doc update: Update preprod (staging) instructions.
Fix for:
b/
17525318
Change-Id: Id93bd3e6e1fd5f203733121e3148cec8b24ab374
Scott Rowe [Mon, 29 Sep 2014 22:53:15 +0000 (22:53 +0000)]
am
9d20628b: docs: b/
16044763 Update IAB docs to give notice of v2 turndown
* commit '
9d20628b4beb38470d4f7d10193ac5a7cc558d41':
docs: b/
16044763 Update IAB docs to give notice of v2 turndown
Scott Rowe [Mon, 29 Sep 2014 21:16:41 +0000 (14:16 -0700)]
docs: b/
16044763 Update IAB docs to give notice of v2 turndown
Change-Id: I696c9b22707d34635ab65b392d90aa7406ab40d0
Ricardo Cervera [Mon, 29 Sep 2014 20:43:55 +0000 (20:43 +0000)]
am
808440cd: Merge "docs: Fixed path for build output." into klp-modular-docs
* commit '
808440cd5e1052f21b937cdcb60acecefd57f23c':
docs: Fixed path for build output.
Justin Koh [Mon, 29 Sep 2014 18:24:03 +0000 (18:24 +0000)]
Merge "DO NOT MERGE Disable vibration from notificationmanagerservice when on watch" into klp-modular-dev
Ricardo Cervera [Mon, 29 Sep 2014 14:56:29 +0000 (14:56 +0000)]
Merge "docs: Fixed path for build output." into klp-modular-docs
Dirk Dougherty [Sat, 27 Sep 2014 05:14:05 +0000 (05:14 +0000)]
am
6373718b: Merge "Doc change: Add new index page for games stories." into klp-modular-docs
* commit '
6373718b883dd945c17987ac64925c0fdc30674d':
Doc change: Add new index page for games stories.
Dirk Dougherty [Sat, 27 Sep 2014 03:16:52 +0000 (03:16 +0000)]
Merge "Doc change: Add new index page for games stories." into klp-modular-docs
Dirk Dougherty [Fri, 26 Sep 2014 21:52:48 +0000 (14:52 -0700)]
Doc change: Add new index page for games stories.
Change-Id: Icd9de0715c8a77333fd73a46f31c3ad81d0b951b
Dirk Dougherty [Sat, 27 Sep 2014 00:22:41 +0000 (00:22 +0000)]
am
afbe165a: Doc change: Add IAB v2 deprecation notice.
* commit '
afbe165aecb00b74f8228314cc60b28af089e8e3':
Doc change: Add IAB v2 deprecation notice.
Justin Koh [Fri, 26 Sep 2014 20:03:26 +0000 (13:03 -0700)]
DO NOT MERGE Disable vibration from notificationmanagerservice when on watch
This is a hack for this version: in a future framework version, there is an API
to do this.
Bug:
17646502
Change-Id: I7b46c0894c5a21189eb82efa04f2ce50ef1f927c
Ricardo Cervera [Fri, 26 Sep 2014 20:25:02 +0000 (13:25 -0700)]
docs: Fixed path for build output.
http://b.android.com/76374
Change-Id: I950174eba961e2bf31600671e438e2b85176a9d4
smain@google.com [Fri, 26 Sep 2014 19:22:59 +0000 (12:22 -0700)]
make sdk download links use HTTPS
bug:
8033954
Change-Id: Idffbb31d397b765fc71ec034d30cc58d1423fdc9
Kevin Ma [Fri, 26 Sep 2014 18:52:24 +0000 (18:52 +0000)]
Merge "Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""" into klp-modular-dev
Kevin Ma [Fri, 26 Sep 2014 18:30:37 +0000 (18:30 +0000)]
Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""
This reverts commit
04c6d73fd0e4472505275688ef8497bc6697647c.
Bug:
17286687
Change-Id: Ic11d1e35198accb5a05cd419f5a522bc39fc789b
Dirk Dougherty [Wed, 17 Sep 2014 22:20:38 +0000 (15:20 -0700)]
Doc change: Add IAB v2 deprecation notice.
Change-Id: Ide22c4aa8c56fdd83cb6ce2989eb8c449c55c7c1
Conflicts:
docs/html/google/play/billing/index.jd
Deepanshu Gupta [Fri, 26 Sep 2014 06:05:03 +0000 (06:05 +0000)]
am
8c61344d: am
528b5862: am
941a8f03: (-s ours) am
0c4893ec: am
2889942f: am
bfeeee8e: (-s ours) am
ecbe6045: am
6950920f: am
1fce990c: am
04861ed4: am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
8c61344d89ab3b1f02228b3da10c8377c41960ff':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 05:53:47 +0000 (05:53 +0000)]
am
528b5862: am
941a8f03: (-s ours) am
0c4893ec: am
2889942f: am
bfeeee8e: (-s ours) am
ecbe6045: am
6950920f: am
1fce990c: am
04861ed4: am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
528b58623feee609055a31e58bf5e1ea3658bf40':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 05:43:38 +0000 (05:43 +0000)]
am
941a8f03: (-s ours) am
0c4893ec: am
2889942f: am
bfeeee8e: (-s ours) am
ecbe6045: am
6950920f: am
1fce990c: am
04861ed4: am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
941a8f03599b91f752c455dceef993887c4b9b20':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 05:43:32 +0000 (05:43 +0000)]
am
ab5971d8: am
1489862e: am
48d0fd99: (-s ours) am
ee41b79c: am
7d23e405: am
f1033174: (-s ours) am
93b185e3: am
363f4d4e: am
8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
ab5971d825d9d59f06b49e1f1e66a24df417124e':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 05:34:34 +0000 (05:34 +0000)]
am
1489862e: am
48d0fd99: (-s ours) am
ee41b79c: am
7d23e405: am
f1033174: (-s ours) am
93b185e3: am
363f4d4e: am
8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
1489862ecee4f298de6a7b27789dda08ff4aa4cf':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 05:32:09 +0000 (05:32 +0000)]
am
0c4893ec: am
2889942f: am
bfeeee8e: (-s ours) am
ecbe6045: am
6950920f: am
1fce990c: am
04861ed4: am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
0c4893ece99418842538db496bb8d53b767b335b':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 05:24:06 +0000 (05:24 +0000)]
am
48d0fd99: (-s ours) am
ee41b79c: am
7d23e405: am
f1033174: (-s ours) am
93b185e3: am
363f4d4e: am
8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
48d0fd99f0a25829f191e7f7ed35cf8d0a2b5902':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 05:20:48 +0000 (05:20 +0000)]
am
2889942f: am
bfeeee8e: (-s ours) am
ecbe6045: am
6950920f: am
1fce990c: am
04861ed4: am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
2889942f4ee7762cdbd097cf3ceea16444f8841a':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 05:13:09 +0000 (05:13 +0000)]
am
ee41b79c: am
7d23e405: am
f1033174: (-s ours) am
93b185e3: am
363f4d4e: am
8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
ee41b79c5735bb3399108bb62de1145fffff3904':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 05:09:54 +0000 (05:09 +0000)]
am
bfeeee8e: (-s ours) am
ecbe6045: am
6950920f: am
1fce990c: am
04861ed4: am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
bfeeee8e4a9cf4bf32067c2ca5807cd612564a99':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 05:02:22 +0000 (05:02 +0000)]
am
ecbe6045: am
6950920f: am
1fce990c: am
04861ed4: am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
ecbe6045911ac7c05a1e999b966577ef7b1bdc18':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 04:57:59 +0000 (04:57 +0000)]
am
7d23e405: am
f1033174: (-s ours) am
93b185e3: am
363f4d4e: am
8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
7d23e405bd3a18f871bcf9856b5a9bcc0ccb1236':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 04:49:31 +0000 (04:49 +0000)]
am
6950920f: am
1fce990c: am
04861ed4: am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
6950920f19980a2416e156d2337b93e386b3f8be':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 04:40:53 +0000 (04:40 +0000)]
am
f1033174: (-s ours) am
93b185e3: am
363f4d4e: am
8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
f103317499bdb12cbcac1754899756d22acde986':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 04:37:23 +0000 (04:37 +0000)]
am
1fce990c: am
04861ed4: am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
1fce990ce9098afe96e75ec1583c771826c50637':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]