Deepanshu Gupta
b490d5d3ec
am 0267541c: am 0a2e42d4: Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev automerge: 9b64954 automerge: fef5001
...
* commit '0267541c90a33c2558d93a0250791ac8fb679688':
Fix BridgeContext.get*ResourceValue()
2014-11-04 02:50:24 +00:00
Deepanshu Gupta
9549824d2b
am 6479282e: am 33996b98: Merge "Support framework menus in ActionBar" into lmp-dev automerge: c23487a automerge: 9a6d8ae
...
* commit '6479282ef584285a2da4d3750acec5ce7d13b6bb':
Support framework menus in ActionBar
2014-11-04 02:50:18 +00:00
Deepanshu Gupta
837e65be0d
am a3698098: am cd5f3bab: Merge "Use the right layout for inflating Action Bar." into lmp-dev automerge: 84a89ed automerge: 5ad0763
...
* commit 'a36980980886a645627542a7bcabf0d718ea79c9':
Use the right layout for inflating Action Bar.
2014-11-04 02:50:10 +00:00
Baligh Uddin
e4ef64da70
am dc9dc7fa: (-s ours) am aa816de4: (-s ours) Import translations. DO NOT MERGE automerge: 07dd521 -s ours automerge: ecd9daa -s ours
...
* commit 'dc9dc7fa9499b279571c7256815448014b1696ed':
Import translations. DO NOT MERGE
2014-11-04 02:21:23 +00:00
Nancy Chen
4f03fa903b
am bff9a23a: am f9503019: Merge "Adn queries for multi-SIM. (2/3)" into lmp-mr1-dev
...
* commit 'bff9a23ab3acc54aa64f6dea0a5ac10aaafec6b5':
Adn queries for multi-SIM. (2/3)
2014-11-04 02:21:17 +00:00
Dianne Hackborn
726715e113
am e6fa3f44: am d1f1ea76: Merge "Few more small meminfo improvements." into lmp-mr1-dev
...
* commit 'e6fa3f44652fd9e23ce64f39bb43458fa4abd60a':
Few more small meminfo improvements.
2014-11-04 02:21:11 +00:00
Bryce Lee
1e2a01a6ed
am 68993a41: am 99a6c1cb: Merge "[Theater Mode] Add framework support for screen double tapping out of theater mode." into lmp-sprout-dev automerge: abf33e4
...
* commit '68993a41b35eb82459b3686c9baff54f980168ed':
[Theater Mode] Add framework support for screen double tapping out of theater mode.
2014-11-04 02:21:05 +00:00
Dirk Dougherty
52973fa234
am 0b8ae553: am 73e55866: am 550465ba: am e1970f12: Doc change: Tv doc updates for publishing in Google Play. automerge: 45729a1
...
* commit '0b8ae553e89e93f73de4fff6ca2c46745177ed9c':
Doc change: Tv doc updates for publishing in Google Play.
2014-11-04 02:20:59 +00:00
Adam Lesinski
4dfff4e727
am 5fa90218: am f7ffcaa7: Merge "Build the split-select tool without C++11 support" into lmp-mr1-dev
...
* commit '5fa9021822577f1e4676db49a6b5cb5d36e4614a':
Build the split-select tool without C++11 support
2014-11-04 02:20:47 +00:00
Adam Lesinski
3fd340028f
Merge commit '78be0498' into manualmerge
...
Conflicts:
libs/androidfw/ResourceTypes.cpp
tools/aapt/Android.mk
tools/aapt/StringPool.cpp
tools/aapt/StringPool.h
Change-Id: I9d69efdfb892032895ace12159d193304f02dc6c
2014-11-03 18:06:22 -08:00
Deepanshu Gupta
0267541c90
am 0a2e42d4: Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev automerge: 9b64954
...
automerge: fef5001
2014-11-04 01:24:41 +00:00
Deepanshu Gupta
6479282ef5
am 33996b98: Merge "Support framework menus in ActionBar" into lmp-dev automerge: c23487a
...
automerge: 9a6d8ae
2014-11-04 01:23:39 +00:00
Deepanshu Gupta
a369809808
am cd5f3bab: Merge "Use the right layout for inflating Action Bar." into lmp-dev automerge: 84a89ed
...
automerge: 5ad0763
2014-11-04 01:22:24 +00:00
Baligh Uddin
dc9dc7fa94
am aa816de4: (-s ours) Import translations. DO NOT MERGE automerge: 07dd521 -s ours
...
automerge: ecd9daa
2014-11-04 01:21:03 +00:00
Deepanshu Gupta
fef500107e
am 0a2e42d4: Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev automerge: 9b64954
...
* commit '0a2e42d4afe9aa81cc41674102dfc999496db845':
Fix BridgeContext.get*ResourceValue()
2014-11-04 01:08:43 +00:00
Deepanshu Gupta
9a6d8ae255
am 33996b98: Merge "Support framework menus in ActionBar" into lmp-dev automerge: c23487a
...
* commit '33996b98787c4625f9cd4a8e38e6a88458773276':
Support framework menus in ActionBar
2014-11-04 01:08:39 +00:00
Deepanshu Gupta
5ad076396c
am cd5f3bab: Merge "Use the right layout for inflating Action Bar." into lmp-dev automerge: 84a89ed
...
* commit 'cd5f3bab37ef1dc041489f53f565416d295916d9':
Use the right layout for inflating Action Bar.
2014-11-04 01:08:23 +00:00
Nancy Chen
bff9a23ab3
am f9503019: Merge "Adn queries for multi-SIM. (2/3)" into lmp-mr1-dev
...
* commit 'f950301945164f5318ea50401fcf23bef824fa9c':
Adn queries for multi-SIM. (2/3)
2014-11-04 01:02:37 +00:00
Dianne Hackborn
e6fa3f4465
am d1f1ea76: Merge "Few more small meminfo improvements." into lmp-mr1-dev
...
* commit 'd1f1ea76e854d518803d68a31e35b34841468f4c':
Few more small meminfo improvements.
2014-11-04 01:01:35 +00:00
Bryce Lee
68993a41b3
am 99a6c1cb: Merge "[Theater Mode] Add framework support for screen double tapping out of theater mode." into lmp-sprout-dev automerge: abf33e4
...
* commit '99a6c1cbe83baff199be6fd69234e20b4b14241d':
[Theater Mode] Add framework support for screen double tapping out of theater mode.
2014-11-04 01:01:29 +00:00
Dirk Dougherty
0b8ae553e8
am 73e55866: am 550465ba: am e1970f12: Doc change: Tv doc updates for publishing in Google Play. automerge: 45729a1
...
* commit '73e558664d56a68745f9f4b2dc23bfee39ec624a':
Doc change: Tv doc updates for publishing in Google Play.
2014-11-04 01:01:19 +00:00
Adam Lesinski
5fa9021822
am f7ffcaa7: Merge "Build the split-select tool without C++11 support" into lmp-mr1-dev
...
* commit 'f7ffcaa7a478eaafc121e84b14dcaf2503dd5457':
Build the split-select tool without C++11 support
2014-11-04 01:01:13 +00:00
Adam Lesinski
78be0498af
am 668f0a35: Merge "Fix issues that will be present in C++11" into lmp-mr1-dev
...
* commit '668f0a356cba44c22d8ca0c9f4711613885d46a9':
Fix issues that will be present in C++11
2014-11-04 01:01:06 +00:00
Baligh Uddin
ecd9daab20
am aa816de4: (-s ours) Import translations. DO NOT MERGE automerge: 07dd521 -s ours
...
* commit 'aa816de4e061ae5a70c759a1c6e55d111c636b6d':
Import translations. DO NOT MERGE
2014-11-04 00:56:16 +00:00
Deepanshu Gupta
0a2e42d4af
Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev
...
automerge: 9b64954
2014-11-04 00:51:51 +00:00
Nancy Chen
f950301945
Merge "Adn queries for multi-SIM. (2/3)" into lmp-mr1-dev
2014-11-04 00:51:29 +00:00
Deepanshu Gupta
33996b9878
Merge "Support framework menus in ActionBar" into lmp-dev
...
automerge: c23487a
2014-11-04 00:50:48 +00:00
Deepanshu Gupta
cd5f3bab37
Merge "Use the right layout for inflating Action Bar." into lmp-dev
...
automerge: 84a89ed
2014-11-04 00:49:43 +00:00
Baligh Uddin
aa816de4e0
Import translations. DO NOT MERGE
...
automerge: 07dd521
2014-11-04 00:48:44 +00:00
Dianne Hackborn
d1f1ea76e8
Merge "Few more small meminfo improvements." into lmp-mr1-dev
2014-11-04 00:41:54 +00:00
Bryce Lee
99a6c1cbe8
Merge "[Theater Mode] Add framework support for screen double tapping out of theater mode." into lmp-sprout-dev
...
automerge: abf33e4
2014-11-04 00:23:50 +00:00
Dirk Dougherty
73e558664d
am 550465ba: am e1970f12: Doc change: Tv doc updates for publishing in Google Play.
...
automerge: 45729a1
2014-11-04 00:21:53 +00:00
Jorim Jaggi
7fd12db350
Merge "Only hide sensitive content when Keyguard is showing" into lmp-mr1-dev automerge: 3c7efdc
...
automerge: 61059fe
2014-11-04 00:05:04 +00:00
Luan Nguyen
9a4dc72b35
am 9b1bad22: am dcea6fa9: am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs automerge: aec7c97 automerge: 4182391 automerge: c85ccdf
...
automerge: 343baef
2014-11-04 00:03:06 +00:00
Joe Fernandez
b070a7cf2f
am f05f8a30: am cbabe576: am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs automerge: 90f734e automerge: 3d76f6a automerge: 583b2cc
...
automerge: efbc7f3
2014-11-04 00:02:07 +00:00
Natalie Masse
f208d803a4
am 471a354c: am 7d3bd06d: am 1e5bb861: Link and typo fixed automerge: bcf9ced automerge: 9f6ea58 automerge: f978dac
...
automerge: f6ca1a6
2014-11-04 00:01:04 +00:00
Scott Rowe
f93197389f
am f6768bac: am c51276ec: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs automerge: a1e3063 automerge: e0da6dd automerge: d584dbe
...
automerge: cca9f67
2014-11-03 23:59:56 +00:00
Joe Fernandez
995c1e0ea4
am 9586eacf: am 2fb449e9: am 031a0863: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs automerge: 2f9ea27 automerge: d6ed575
...
automerge: a1ce8ca
2014-11-03 23:58:10 +00:00
Prashant Malani
b507d8dee1
am eaf585a1: am 80c26ce0: am ee2802eb: Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev automerge: 645e017 -s ours automerge: a8f4b8a -s ours
...
automerge: 9ffa931
2014-11-03 23:57:07 +00:00
Ricardo Cervera
cd8bff2369
am c96d62a6: am b50fd5d5: am 764e61ad: am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs automerge: dc1f308 automerge: 884b473
...
automerge: e3835c1
2014-11-03 23:56:00 +00:00
Luan Nguyen
768e068bbf
am 4e4a1ed3: am 879b948e: am acbfd20d: am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs automerge: c07a288 automerge: cc8b367
...
automerge: d3b5483
2014-11-03 23:54:56 +00:00
smain@google.com
cbc3b3db1a
am c360ec9b: am afa68731: am 841b7a21: am 075531ae: add the butterbar for L announce to Preview landing page automerge: e43bb6a automerge: 870afdb
...
automerge: 5dbac8e
2014-11-03 23:53:23 +00:00
smain@google.com
6757cc5543
am ec3eb1c7: am 6df786d3: am 87c4d66d: am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 automerge: 6fbe299 automerge: 469c8c8
...
automerge: 21fdc41
2014-11-03 23:52:19 +00:00
Ricardo Cervera-Navarro
4a1fb17845
am dc489b6c: am 521f964a: am e3e6193e: am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs automerge: c93723b automerge: 4687757
...
automerge: 6bda7d2
2014-11-03 23:51:11 +00:00
Rich Slogar
d55f47318f
am 4a6b69c5: am ec4bc006: am 4f8a41cc: am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs automerge: 858cfad automerge: d84910b
...
automerge: 6b54651
2014-11-03 23:50:03 +00:00
Eric Gilmore
921ceb2eaa
am f38b98f3: am e9324d0f: am 7ecb0a3e: Merge commit \'a4eb81b\' into klp-modular-dev-plus-aosp automerge: 068cb36
...
automerge: ee870df
2014-11-03 23:48:43 +00:00
Adam Lesinski
f7ffcaa7a4
Merge "Build the split-select tool without C++11 support" into lmp-mr1-dev
2014-11-03 23:38:56 +00:00
Adam Lesinski
668f0a356c
Merge "Fix issues that will be present in C++11" into lmp-mr1-dev
2014-11-03 23:38:43 +00:00
Jorim Jaggi
61059fe82c
Merge "Only hide sensitive content when Keyguard is showing" into lmp-mr1-dev
...
automerge: 3c7efdc
2014-11-03 23:27:18 +00:00
Deepanshu Gupta
9b64954cb5
Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev
2014-11-03 23:15:03 +00:00
