OSDN Git Service
George Mount [Thu, 7 Mar 2013 21:58:10 +0000 (21:58 +0000)]
am
5a95ad86: am
6f3bd23d: Merge "Add batch operations to PhotoProvider" into gb-ub-photos-bryce
* commit '
5a95ad869eedac439c1f9ef21c48cc0eb28e30fa':
Add batch operations to PhotoProvider
George Mount [Thu, 7 Mar 2013 21:56:14 +0000 (13:56 -0800)]
am
6f3bd23d: Merge "Add batch operations to PhotoProvider" into gb-ub-photos-bryce
* commit '
6f3bd23d7fd83a67f5e357939b06057f40051df3':
Add batch operations to PhotoProvider
George Mount [Thu, 7 Mar 2013 21:54:29 +0000 (21:54 +0000)]
Merge "Add batch operations to PhotoProvider" into gb-ub-photos-bryce
George Mount [Thu, 7 Mar 2013 17:02:26 +0000 (09:02 -0800)]
Add batch operations to PhotoProvider
Change-Id: I36b2f0305e2ef7502df7b896c8baedc86519ac52
John Reck [Thu, 7 Mar 2013 19:05:22 +0000 (19:05 +0000)]
John Reck [Thu, 7 Mar 2013 19:03:22 +0000 (11:03 -0800)]
am
2ff8d800: recycle bitmaps
* commit '
2ff8d80018c27abdd475a7610ab3d684c4b33acb':
recycle bitmaps
John Reck [Thu, 7 Mar 2013 19:00:29 +0000 (11:00 -0800)]
recycle bitmaps
Change-Id: I3afda4f009fda07b4e2858cb65dee4444f8484e5
Mangesh Ghiware [Thu, 7 Mar 2013 17:35:55 +0000 (17:35 +0000)]
am
c1c711ee: am
17362f81: Remove redundant Album NAME (replaced by TITLE)
* commit '
c1c711ee1eb7d0de4a886020e9da9f9cd5212968':
Remove redundant Album NAME (replaced by TITLE)
Mangesh Ghiware [Thu, 7 Mar 2013 17:31:31 +0000 (09:31 -0800)]
am
17362f81: Remove redundant Album NAME (replaced by TITLE)
* commit '
17362f811fa92ff0d9f92b3c733f08704de2f135':
Remove redundant Album NAME (replaced by TITLE)
George Mount [Thu, 7 Mar 2013 17:31:10 +0000 (17:31 +0000)]
am
404219e5: am
cad2ab01: Merge "Add inserts to PhotoProvider." into gb-ub-photos-bryce
* commit '
404219e55171b6fcfb666f16174b41fa25fba794':
Add inserts to PhotoProvider.
George Mount [Thu, 7 Mar 2013 17:31:10 +0000 (17:31 +0000)]
am
d258438c: am
e1796ac1: Merge "Add album cover art downloading." into gb-ub-photos-bryce
* commit '
d258438cbfedb5184adcfd9238f28299de1c38a3':
Add album cover art downloading.
Baligh Uddin [Thu, 7 Mar 2013 17:30:56 +0000 (17:30 +0000)]
am
2fee25d9: am
7607b9a9: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
2fee25d93cbdabfb87152038b3ea788d9895921b':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 7 Mar 2013 17:30:56 +0000 (17:30 +0000)]
am
956d934e: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
956d934ebf9307d350babad7cc49dc33c7e8b2c7':
Import translations. DO NOT MERGE
Mangesh Ghiware [Thu, 7 Mar 2013 16:55:18 +0000 (08:55 -0800)]
Remove redundant Album NAME (replaced by TITLE)
Change-Id: I0482f8b4bd85e07aefe4af02b1e8dab4702eb9f6
George Mount [Thu, 7 Mar 2013 16:57:14 +0000 (08:57 -0800)]
am
cad2ab01: Merge "Add inserts to PhotoProvider." into gb-ub-photos-bryce
* commit '
cad2ab01fe5d95f8a98f15c898fe532f85daeb89':
Add inserts to PhotoProvider.
George Mount [Thu, 7 Mar 2013 16:57:13 +0000 (08:57 -0800)]
am
e1796ac1: Merge "Add album cover art downloading." into gb-ub-photos-bryce
* commit '
e1796ac13fad20584ae95767f6790c4090bffc3a':
Add album cover art downloading.
George Mount [Thu, 7 Mar 2013 16:56:23 +0000 (16:56 +0000)]
Merge "Add inserts to PhotoProvider." into gb-ub-photos-bryce
George Mount [Thu, 7 Mar 2013 16:55:46 +0000 (16:55 +0000)]
Merge "Add album cover art downloading." into gb-ub-photos-bryce
George Mount [Thu, 7 Mar 2013 01:21:29 +0000 (17:21 -0800)]
Add inserts to PhotoProvider.
Change-Id: Ie91df59975d185948c7c2fd96432d311847c3e00
George Mount [Wed, 6 Mar 2013 23:35:48 +0000 (15:35 -0800)]
Add album cover art downloading.
Change-Id: I660761c3bf59b1b314be9674fc3f1e43f307c686
Baligh Uddin [Thu, 7 Mar 2013 04:51:35 +0000 (20:51 -0800)]
am
7607b9a9: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
7607b9a9f5be5486595d8040c01a506a125ed7b6':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 7 Mar 2013 04:50:47 +0000 (04:50 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Thu, 7 Mar 2013 04:50:12 +0000 (04:50 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
John Reck [Thu, 7 Mar 2013 00:56:12 +0000 (00:56 +0000)]
am
3aaf6efa: am
0eed2b56: Merge "Data provider shim" into gb-ub-photos-bryce
* commit '
3aaf6efa0f55721976b2e055c6b23485b6786734':
Data provider shim
John Reck [Thu, 7 Mar 2013 00:54:11 +0000 (16:54 -0800)]
am
0eed2b56: Merge "Data provider shim" into gb-ub-photos-bryce
* commit '
0eed2b56583420f85a02f01707e49f37467bbad7':
Data provider shim
John Reck [Thu, 7 Mar 2013 00:53:13 +0000 (00:53 +0000)]
Merge "Data provider shim" into gb-ub-photos-bryce
John Reck [Thu, 7 Mar 2013 00:36:45 +0000 (16:36 -0800)]
Data provider shim
Bolt the new UI framework on top of the old data model temporarily
to unblock UI work
Change-Id: I2f61f70647faca1f6a95b1f02f719ec4277fa5fb
George Mount [Thu, 7 Mar 2013 00:09:11 +0000 (00:09 +0000)]
am
9f387c22: am
1732a9cf: Merge "Add required fields to PhotoProvider." into gb-ub-photos-bryce
* commit '
9f387c22ac516f0f4df69034dbdafc794d08cff9':
Add required fields to PhotoProvider.
George Mount [Thu, 7 Mar 2013 00:06:45 +0000 (16:06 -0800)]
am
1732a9cf: Merge "Add required fields to PhotoProvider." into gb-ub-photos-bryce
* commit '
1732a9cfe68564c7b55b0157575561ecf0f9fdc4':
Add required fields to PhotoProvider.
George Mount [Thu, 7 Mar 2013 00:05:42 +0000 (00:05 +0000)]
Merge "Add required fields to PhotoProvider." into gb-ub-photos-bryce
George Mount [Wed, 6 Mar 2013 19:49:10 +0000 (11:49 -0800)]
Add required fields to PhotoProvider.
Change-Id: I1e830702412d4431ba3b01fe4945a4818385b6cd
Bobby Georgescu [Wed, 6 Mar 2013 23:13:58 +0000 (23:13 +0000)]
am
687c2a2f: am
fd21feac: Merge "Preliminary AlbumSet UI" into gb-ub-photos-bryce
* commit '
687c2a2f596c39ebff119b6f6250563039c5eed0':
Preliminary AlbumSet UI
Bobby Georgescu [Wed, 6 Mar 2013 23:12:27 +0000 (15:12 -0800)]
am
fd21feac: Merge "Preliminary AlbumSet UI" into gb-ub-photos-bryce
* commit '
fd21feacb7bca840056f82ad219d6e93374a73c2':
Preliminary AlbumSet UI
Bobby Georgescu [Wed, 6 Mar 2013 23:10:22 +0000 (23:10 +0000)]
Merge "Preliminary AlbumSet UI" into gb-ub-photos-bryce
Doris Liu [Wed, 6 Mar 2013 22:54:39 +0000 (22:54 +0000)]
am
7233f395: am
8d2a3057: Fix camera switcher mode picker
* commit '
7233f39558f0d80d697d3d5415ed66bf0d9a162e':
Fix camera switcher mode picker
Doris Liu [Wed, 6 Mar 2013 22:52:15 +0000 (14:52 -0800)]
am
8d2a3057: Fix camera switcher mode picker
* commit '
8d2a3057bb8a4a3bbaa5be3ef9ac91f00ff50957':
Fix camera switcher mode picker
Doris Liu [Wed, 6 Mar 2013 21:56:53 +0000 (13:56 -0800)]
Fix camera switcher mode picker
Bug:
8330008
Change-Id: I08ccd38a6898e88d28214cceb22cee6688ce0b3f
John Hoford [Wed, 6 Mar 2013 21:09:52 +0000 (21:09 +0000)]
am
997b0a75: am
4e330be1: Merge "fix undo bug" into gb-ub-photos-bryce
* commit '
997b0a7578ecbcdf89152f18611f62230d0d0411':
fix undo bug
John Hoford [Wed, 6 Mar 2013 21:07:35 +0000 (13:07 -0800)]
am
4e330be1: Merge "fix undo bug" into gb-ub-photos-bryce
* commit '
4e330be1512162dd0ed4988352cd32017758f3d6':
fix undo bug
John Hoford [Wed, 6 Mar 2013 21:05:05 +0000 (21:05 +0000)]
Merge "fix undo bug" into gb-ub-photos-bryce
John Hoford [Wed, 6 Mar 2013 20:26:37 +0000 (12:26 -0800)]
fix undo bug
bug:
8319433
Change-Id: If6bea005677b63267130d446e7b0298d21bbb3be
Doris Liu [Wed, 6 Mar 2013 19:45:48 +0000 (19:45 +0000)]
am
38f86e40: am
8892e5e7: Fix NPE in switcher popup
* commit '
38f86e402df3d99032b22eeac4578efdfa269f12':
Fix NPE in switcher popup
Doris Liu [Wed, 6 Mar 2013 19:42:59 +0000 (11:42 -0800)]
am
8892e5e7: Fix NPE in switcher popup
* commit '
8892e5e7ffa1f33b527b7753b07723dfd685a9cd':
Fix NPE in switcher popup
Doris Liu [Wed, 6 Mar 2013 19:22:48 +0000 (11:22 -0800)]
Fix NPE in switcher popup
Bug:
8327966
Change-Id: I4181a59871c065435756c100b3e8b43930781ee5
Baligh Uddin [Wed, 6 Mar 2013 19:13:56 +0000 (11:13 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7d69704e22e7cd37510d37047c3b570b5d78fb09
Auto-generated-cl: translation import
Baligh Uddin [Wed, 6 Mar 2013 19:13:25 +0000 (11:13 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie62ac98733f3baad857d0b1e7ebc4b6898b7c10f
Auto-generated-cl: translation import
Baligh Uddin [Wed, 6 Mar 2013 16:48:01 +0000 (16:48 +0000)]
am
2962966e: am
f831c736: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
2962966e5f274b77380cf5716a61aff5c1b55355':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 6 Mar 2013 16:48:01 +0000 (16:48 +0000)]
am
670444be: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
670444be68f153511e05af6df89beeabe89313b2':
Import translations. DO NOT MERGE
Doris Liu [Wed, 6 Mar 2013 16:47:53 +0000 (16:47 +0000)]
am
9a08794f: am
7f51a845: Merge "Add a black bar symmetric to nav bar" into gb-ub-photos-bryce
* commit '
9a08794fcb62acde0cc1dcd09a739060d1a4ea0b':
Add a black bar symmetric to nav bar
Doris Liu [Wed, 6 Mar 2013 16:47:52 +0000 (16:47 +0000)]
am
62bacd5d: am
457bab95: Merge "Keep camera controls on the same physical side" into gb-ub-photos-bryce
* commit '
62bacd5dfad22b619d2ded3b8a9680b2538869e5':
Keep camera controls on the same physical side
Baligh Uddin [Wed, 6 Mar 2013 06:03:31 +0000 (22:03 -0800)]
am
f831c736: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
f831c736a3c0c20b59873d98f8abe5b2a234f402':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 6 Mar 2013 06:02:43 +0000 (06:02 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 6 Mar 2013 06:02:21 +0000 (06:02 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Doris Liu [Wed, 6 Mar 2013 03:48:28 +0000 (19:48 -0800)]
am
7f51a845: Merge "Add a black bar symmetric to nav bar" into gb-ub-photos-bryce
* commit '
7f51a8455b34d794797388d31c1b42b0de9844d5':
Add a black bar symmetric to nav bar
Doris Liu [Wed, 6 Mar 2013 03:48:27 +0000 (19:48 -0800)]
am
457bab95: Merge "Keep camera controls on the same physical side" into gb-ub-photos-bryce
* commit '
457bab952ea6b8babf2d37c817f06aed3829ba61':
Keep camera controls on the same physical side
Doris Liu [Wed, 6 Mar 2013 03:47:13 +0000 (03:47 +0000)]
Merge "Add a black bar symmetric to nav bar" into gb-ub-photos-bryce
Doris Liu [Wed, 6 Mar 2013 03:46:52 +0000 (03:46 +0000)]
Merge "Keep camera controls on the same physical side" into gb-ub-photos-bryce
Doris Liu [Tue, 5 Mar 2013 17:54:25 +0000 (09:54 -0800)]
Add a black bar symmetric to nav bar
Also fix bug:
8323926
Change-Id: I4886b285dee8ad71ad72a55e96bf699b7c18c9f4
Bobby Georgescu [Mon, 4 Mar 2013 19:44:49 +0000 (11:44 -0800)]
Preliminary AlbumSet UI
Change-Id: Ie99bd2939bfcb47c80605cbb22b84b1064098e91
nicolasroard [Tue, 5 Mar 2013 22:37:58 +0000 (22:37 +0000)]
am
72693710: am
63b33e8c: Improves visual history
* commit '
726937108a1d39b3c8ecdd7e2088ffccc7d1dd1d':
Improves visual history
nicolasroard [Tue, 5 Mar 2013 22:33:34 +0000 (14:33 -0800)]
am
63b33e8c: Improves visual history
* commit '
63b33e8c7ebeeec2b520fb419d89ada712ad6604':
Improves visual history
nicolasroard [Tue, 5 Mar 2013 22:27:54 +0000 (14:27 -0800)]
Improves visual history
Change-Id: Ie43e99777d590a504b068d81f327119cca03b9d9
Doris Liu [Tue, 5 Mar 2013 06:19:10 +0000 (22:19 -0800)]
Keep camera controls on the same physical side
Change-Id: I09c50650c77a89fadfeb376564ef43e750994f8a
nicolasroard [Tue, 5 Mar 2013 15:52:44 +0000 (15:52 +0000)]
nicolasroard [Tue, 5 Mar 2013 15:50:28 +0000 (07:50 -0800)]
nicolasroard [Tue, 5 Mar 2013 05:43:49 +0000 (21:43 -0800)]
Visual History
Change-Id: I3397c44b8c47985c97de5b82456c03469b2fb8db
nicolasroard [Tue, 5 Mar 2013 03:06:25 +0000 (03:06 +0000)]
am
4446c661: am
a0adf211: Merge "Simplify and speed up thumbnail creation" into gb-ub-photos-bryce
* commit '
4446c6619033a62980e453ece3e72bb7bc105143':
Simplify and speed up thumbnail creation
nicolasroard [Tue, 5 Mar 2013 03:04:43 +0000 (19:04 -0800)]
am
a0adf211: Merge "Simplify and speed up thumbnail creation" into gb-ub-photos-bryce
* commit '
a0adf2113b8728d92f270953ca8cab50335fe68e':
Simplify and speed up thumbnail creation
nicolasroard [Tue, 5 Mar 2013 03:03:04 +0000 (03:03 +0000)]
Merge "Simplify and speed up thumbnail creation" into gb-ub-photos-bryce
nicolasroard [Tue, 5 Mar 2013 02:44:14 +0000 (18:44 -0800)]
Simplify and speed up thumbnail creation
Change-Id: I1423573c600a807081f81d3cb3036b690e426f9e
John Hoford [Tue, 5 Mar 2013 02:43:21 +0000 (02:43 +0000)]
am
b5941762: am
fc7d4651: fixed vignetnette refresh during pan/zoom
* commit '
b59417626daa9513246171b53f965a37f7273597':
fixed vignetnette refresh during pan/zoom
John Hoford [Tue, 5 Mar 2013 02:40:29 +0000 (18:40 -0800)]
am
fc7d4651: fixed vignetnette refresh during pan/zoom
* commit '
fc7d46515db7a3a50f7416c2462030609391cf95':
fixed vignetnette refresh during pan/zoom
John Hoford [Tue, 5 Mar 2013 02:33:55 +0000 (18:33 -0800)]
fixed vignetnette refresh during pan/zoom
Change-Id: I6bcc13cdd5232a15f199d8f64258c450f045c1cf
John Hoford [Tue, 5 Mar 2013 02:13:35 +0000 (02:13 +0000)]
am
2a20a8a2: am
5300e0c5: fix tiny planet shown after rotation
* commit '
2a20a8a21f42649a50c60636605c7d57f87d49f4':
fix tiny planet shown after rotation
John Hoford [Tue, 5 Mar 2013 02:11:14 +0000 (18:11 -0800)]
am
5300e0c5: fix tiny planet shown after rotation
* commit '
5300e0c54110d67f85fdb2ee9c90be58f50ca4ac':
fix tiny planet shown after rotation
John Hoford [Tue, 5 Mar 2013 01:50:58 +0000 (17:50 -0800)]
fix tiny planet shown after rotation
Change-Id: Ia27f424c7936b8f3c7fb69d3b80966d4f364f116
nicolasroard [Tue, 5 Mar 2013 01:53:03 +0000 (01:53 +0000)]
am
a4a98183: am
cdea1074: Improves state/history panel behaviour
* commit '
a4a98183d17fc4d9f130819698fd6988670982ea':
Improves state/history panel behaviour
nicolasroard [Tue, 5 Mar 2013 01:51:03 +0000 (17:51 -0800)]
am
cdea1074: Improves state/history panel behaviour
* commit '
cdea10749cbdb6bab8f49f1b5b562b6e89781981':
Improves state/history panel behaviour
nicolasroard [Tue, 5 Mar 2013 00:42:53 +0000 (16:42 -0800)]
Improves state/history panel behaviour
Change-Id: Icfd071aa5de11f1fe8cbba34f2837d5a850f9a68
George Mount [Tue, 5 Mar 2013 00:17:23 +0000 (00:17 +0000)]
am
e9af7056: am
9c223cf1: Merge "Fix build break." into gb-ub-photos-bryce
* commit '
e9af70567534c4c946347b3cfd9f005a363c5c0a':
Fix build break.
George Mount [Tue, 5 Mar 2013 00:14:35 +0000 (16:14 -0800)]
am
9c223cf1: Merge "Fix build break." into gb-ub-photos-bryce
* commit '
9c223cf1072172845c9118fac028371b5a57919a':
Fix build break.
nicolasroard [Tue, 5 Mar 2013 00:14:02 +0000 (00:14 +0000)]
am
c241545a: am
c882c3fe: Merge "UI cleanup" into gb-ub-photos-bryce
* commit '
c241545ab013a81f4d30528c52139a7b664edf2e':
UI cleanup
nicolasroard [Tue, 5 Mar 2013 00:11:24 +0000 (16:11 -0800)]
am
c882c3fe: Merge "UI cleanup" into gb-ub-photos-bryce
* commit '
c882c3fec7409a40d4b4ff401fcfa81be7684424':
UI cleanup
George Mount [Tue, 5 Mar 2013 00:11:03 +0000 (00:11 +0000)]
Merge "Fix build break." into gb-ub-photos-bryce
nicolasroard [Tue, 5 Mar 2013 00:09:29 +0000 (00:09 +0000)]
Merge "UI cleanup" into gb-ub-photos-bryce
George Mount [Tue, 5 Mar 2013 00:08:30 +0000 (16:08 -0800)]
Fix build break.
Change-Id: If19356395fe005a98036888cd9a688c4d36720ea
nicolasroard [Tue, 5 Mar 2013 00:01:24 +0000 (16:01 -0800)]
UI cleanup
Change-Id: Iaf138455651511e610b640a716820bd846284948
George Mount [Mon, 4 Mar 2013 23:53:50 +0000 (23:53 +0000)]
am
6f991596: am
8438e102: Merge "Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk" into gb-ub-photos-bryce
* commit '
6f99159695f952b4e2d1d3a968354bdd3b9e4e64':
Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk
George Mount [Mon, 4 Mar 2013 23:49:05 +0000 (15:49 -0800)]
am
8438e102: Merge "Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk" into gb-ub-photos-bryce
* commit '
8438e10230fe1ce102e5c29f8eac6c96e4eec900':
Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk
George Mount [Mon, 4 Mar 2013 23:47:29 +0000 (23:47 +0000)]
Merge "Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk" into gb-ub-photos-bryce
George Mount [Thu, 28 Feb 2013 18:52:59 +0000 (10:52 -0800)]
Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk
Change-Id: I6630e7a5ba0883b887915f63094885a2dc9f025c
Bobby Georgescu [Mon, 4 Mar 2013 20:35:57 +0000 (20:35 +0000)]
am
8dab2ccb: am
4cf62cd1: Merge "Clean up comments" into gb-ub-photos-bryce
* commit '
8dab2ccb07e41a5b5fa9b53cc3290cb42c508978':
Clean up comments
Bobby Georgescu [Mon, 4 Mar 2013 20:34:19 +0000 (12:34 -0800)]
am
4cf62cd1: Merge "Clean up comments" into gb-ub-photos-bryce
* commit '
4cf62cd1c8ee14a7e4b698f0be49ceba00f1b085':
Clean up comments
Bobby Georgescu [Mon, 4 Mar 2013 20:32:43 +0000 (20:32 +0000)]
Merge "Clean up comments" into gb-ub-photos-bryce
Bobby Georgescu [Mon, 4 Mar 2013 20:29:42 +0000 (12:29 -0800)]
Clean up comments
Change-Id: I29e6d7ffef6b6b319262982709794aadd7919d8c
Baligh Uddin [Mon, 4 Mar 2013 20:27:03 +0000 (12:27 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic524e207ef265824359c697e352dd4007af74f31
Auto-generated-cl: translation import
Baligh Uddin [Mon, 4 Mar 2013 20:26:38 +0000 (12:26 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id6aba0c7b2d7a9efe94a6f5cd15c146f58b45e13
Auto-generated-cl: translation import
The Android Open Source Project [Mon, 4 Mar 2013 19:06:56 +0000 (11:06 -0800)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I33a0b7686aaf8e8a10c3ec222b673297ad7e76a1
Doris Liu [Mon, 4 Mar 2013 18:37:29 +0000 (10:37 -0800)]
am
fa7440b0: Merge "Flatten view hierarchy and rotate views" into gb-ub-photos-bryce
* commit '
fa7440b031c06a8c69e19ee0f6a3d44a0beb8e71':
Flatten view hierarchy and rotate views
Doris Liu [Mon, 4 Mar 2013 18:36:36 +0000 (18:36 +0000)]
Merge "Flatten view hierarchy and rotate views" into gb-ub-photos-bryce