Ecosyste.ms: OpenCollective

An open API service for software projects hosted on Open Collective.

github.com/PitchBlackRecoveryProject/android_external_f2fs-tools


https://github.com/PitchBlackRecoveryProject/android_external_f2fs-tools

Merge "sload.f2fs: update build for android" am: ab0511892c

am: 355c5a4190

Change-Id: I5c05dcb13c2db6611234293e8e3dace989ce348a

a30c3593c05579af12aa2693c56539cb602e9917 authored about 7 years ago
Merge "f2fs-tools: allow multiple prog names" am: d895f84c54

am: afc6c3c6bb

Change-Id: Iee91c364d002f9764c93bc58a1ac17af7c6a7f80

b5da52b8be0508340b77f4b9ede7968f32540ad2 authored about 7 years ago
Merge "mkfs.f2fs: match uid/gid/projid between root inode and quota info" am: 188cc37d69

am: 0a5fc6de5e

Change-Id: Iff044f6d393c97a19ffffd558f835e88f633c390

e42fcdb159e004b45deebc09bd9bb01343512827 authored about 7 years ago
Merge "mkfs.f2fs: show debug message for quota data writes" am: 4b77d38c1a

am: bcce31ae46

Change-Id: I9e7fe20c0abed081e1ace448a84dc0eb10bcd259

03d7106d93ef3dcc802d0215e2083810f1fb5d2d authored about 7 years ago
Merge "f2fs-tools: build tools selectively" am: 9047d8b586

am: ca83a3d37f

Change-Id: I3ab596c0726465f3112eb3ed92f58e97f830c8d7

1961f84552e3dfc4f6191aa344bee9c1ccbb6124 authored about 7 years ago
Merge "libf2fs: propagate error from f2fs_{finalize,fsync}_device" am: 25d3114fe5

am: 838a42c948

Change-Id: I317d9a850caca481f4502d39fbe221261653b738

2386e605e0981e922ea64f542732240603b40f39 authored about 7 years ago
Merge "f2fs-tools: enable sparse_file opeartions"

am: c6c423c336

Change-Id: I7b2fb860462fd2d7944053c2323edba388f9475a

5cdd03ab0dbb2a498f2d91317540f9ef9476fc16 authored about 7 years ago
Merge "Android.bp: add Android.bp"

am: 9668ba0dee

Change-Id: Ibec7521a0fdc0d4c59ab2a091b016e1bd5ef2051

f0f7780db1396fe1f17f1081972981dba13e882a authored about 7 years ago
Merge "sload.f2fs: update build for android"

am: ab0511892c

Change-Id: I3a1945978846e2016399df619cef22630a9ce498

355c5a419049eb65cd593eb21ff56a7021404ce9 authored about 7 years ago
Merge "f2fs-tools: allow multiple prog names"

am: d895f84c54

Change-Id: I1d491131d81e4cfa5c6d2e0727c964b7ab942871

afc6c3c6bbcd1f6e4794a60116a55721eec4be42 authored about 7 years ago
Merge "mkfs.f2fs: match uid/gid/projid between root inode and quota info"

am: 188cc37d69

Change-Id: I05bc855c5791db3e1d43e88d3649257bb4761db2

0a5fc6de5e0abbcac82e149997331f2965e1949d authored about 7 years ago
Merge "mkfs.f2fs: show debug message for quota data writes"

am: 4b77d38c1a

Change-Id: Ib8cc74976040014e2b2eef1d8219240646b28242

bcce31ae467399bba33b8ee4e9babe81cb19b672 authored about 7 years ago
Merge "f2fs-tools: build tools selectively"

am: 9047d8b586

Change-Id: Ie2bc2665ad55b8780e0f5a5846891b622a35c323

ca83a3d37f3fe3816758d58beceb6447c14f40db authored about 7 years ago
Merge "libf2fs: propagate error from f2fs_{finalize,fsync}_device"

am: 25d3114fe5

Change-Id: I1ddec71321268b2a5152b5353cfb2f3b6c5c8985

838a42c9485c3c2e900a4a0a6db2f4988060edf4 authored about 7 years ago
Merge "f2fs-tools: enable sparse_file opeartions"

c6c423c3363b7ab07018c985fcc5f800a4d17b23 authored about 7 years ago
Merge "Android.bp: add Android.bp"

9668ba0dee92b338dcdbaad3afec82c163039289 authored about 7 years ago
Merge "sload.f2fs: update build for android"

ab0511892c6004c6c1d8308f2d11aa2be5fccdd1 authored about 7 years ago
Merge "f2fs-tools: adjust feature name" am: 91a15a676b am: 6df1ce0e38

am: 5ac34a3425

Change-Id: I1d914c9096d53604b55aef4f550b91872e7918c0

fc693a24df71d11dd80cd8dd033c082ceb8dce7f authored about 7 years ago
Merge "f2fs: avoid memory leak in f2fs_write_root_inode" am: 55310b99c8 am: 2e6c6ab54a

am: 6947cf7030

Change-Id: Ia010dba20a831a2dcf00d421cf947a90dd716fef

3bbb041b19373b342a74ff9601212c21ae55e29e authored about 7 years ago
Merge "fsck.f2fs: fix potential stack overflow issue" am: 4727eff1ff am: 0598f1f854

am: 1f2467ccb0

Change-Id: I38059e93a47efed3343c8dc7421b078451db99ab

ecf76238fafba87dd60a6e8e197101f47e896261 authored about 7 years ago
Merge "dump.f2fs: show extra attr only when feature is enabled" am: e2ace6b30d am: c25b85129e

am: 510070c767

Change-Id: I605fbb8253bf3722e1eaee4ca7c62357f1a72cf9

da42e11955e44a03b6ad6ba745407ae8d23f8b84 authored about 7 years ago
Merge "f2fs-tools: allow multiple prog names"

d895f84c54bcf56597780f46a5459503733e9077 authored about 7 years ago
Merge "mkfs.f2fs: match uid/gid/projid between root inode and quota info"

188cc37d69c707968f3becf790b6a3c077d606f4 authored about 7 years ago
Merge "mkfs.f2fs: show debug message for quota data writes"

4b77d38c1af13b72bf9659b8b7945bdc6321b4f4 authored about 7 years ago
Merge "f2fs-tools: build tools selectively"

9047d8b586877e77815e9749d9ad7d8f451d09ec authored about 7 years ago
Merge "libf2fs: propagate error from f2fs_{finalize,fsync}_device"

25d3114fe5de47d1f1e19f15fd5d437106932974 authored about 7 years ago
Merge "f2fs-tools: adjust feature name" am: 91a15a676b

am: 6df1ce0e38

Change-Id: I942e77794bd265f35c408e613d94103c5c36d32a

5ac34a34251997a0cd8a48863e8b2e90ba1935f7 authored about 7 years ago
Merge "f2fs: avoid memory leak in f2fs_write_root_inode" am: 55310b99c8

am: 2e6c6ab54a

Change-Id: Iab54c85f67fd0abede5334d8a67e8de74420d1ad

6947cf7030070c9c7875e5f16a2c8780418016a9 authored about 7 years ago
Merge "fsck.f2fs: fix potential stack overflow issue" am: 4727eff1ff

am: 0598f1f854

Change-Id: I59c0f74f1c47f89291046a8e15de77da6af5c4d3

1f2467ccb08fdc5dcdad961eab871496c5b1f223 authored about 7 years ago
Merge "dump.f2fs: show extra attr only when feature is enabled" am: e2ace6b30d

am: c25b85129e

Change-Id: I1334c15408b70955a317c6d2fc8c36d977d2b204

510070c767cb04c79f398f1db19cfa3aae861023 authored about 7 years ago
Merge "f2fs-tools: adjust feature name"

am: 91a15a676b

Change-Id: I6734e1930f41e3ba2960e0fbda201a8dc41087d7

6df1ce0e3836b32d53919e8e7644955f48f60656 authored about 7 years ago
Merge "f2fs: avoid memory leak in f2fs_write_root_inode"

am: 55310b99c8

Change-Id: I325ed5fa346ec8d64b4de7b21cdecf83f171ec62

2e6c6ab54abafc6e5ffe96641e62898c92c159eb authored about 7 years ago
Merge "fsck.f2fs: fix potential stack overflow issue"

am: 4727eff1ff

Change-Id: I0ad7eccf522fc78a8bfafa20a7cc61dca413ace1

0598f1f8548a5fdc541dcc89618fd6c8dc5af9d2 authored about 7 years ago
Merge "dump.f2fs: show extra attr only when feature is enabled"

am: e2ace6b30d

Change-Id: Ic58cd47a26c099ccd16eef69f68c756ec1dec7fa

c25b85129e51e7ccef605b9937f6003995fefacf authored about 7 years ago
Merge "f2fs-tools: adjust feature name"

91a15a676bf44ac04341b6854864713def634d9a authored about 7 years ago
Merge "f2fs: avoid memory leak in f2fs_write_root_inode"

55310b99c80c315b6329bd18479df548edeb401a authored about 7 years ago
Merge "fsck.f2fs: fix potential stack overflow issue"

4727eff1ff46eaca4f3ef347ad895cf45727ddac authored about 7 years ago
Merge "dump.f2fs: show extra attr only when feature is enabled"

e2ace6b30d2617b4ed40b584b703112472ac52d2 authored about 7 years ago
mkfs.f2fs: Windows Android SDK support

This patch enables cross compilation for Windows Android SDK
by using ANDROID_WINDOWS_HOST.

Sig...

b44f7262a1659d457105e2bb06238c753f2c2672 authored about 7 years ago
f2fs-tools: enable sparse_file opeartions

This adds reading data from sparse_file.

Signed-off-by: Jaegeuk Kim <[email protected]>

789ac2df1fb3b8dcc3efe247d8d3838673512d77 authored about 7 years ago
Android.bp: add windows build for make_f2fs

Change-Id: I2892eeb6c42717649249570f297af258d6e27ac0
Signed-off-by: Jaegeuk Kim <jaegeuk@google....

830fd60b818dd34ebab4016d2a368a7d60ace9aa authored about 7 years ago
mkfs.f2fs: Windows Android SDK support

This patch enables cross compilation for Windows Android SDK
by using ANDROID_WINDOWS_HOST.

Sig...

e7de1502e02cce4e2b6f9ca1215cf1e43f513a14 authored about 7 years ago
Android.bp: build sload_f2fs

Change-Id: I5e8a7588279cfcefb3e69bb96f522627c6b80188
Signed-off-by: Jaegeuk Kim <jaegeuk@google....

cbc4784a937a1a6abc2a37e0b760f4b56856e42f authored about 7 years ago
f2fs-tools: enable sparse_file opeartions

This adds reading data from sparse_file.

Change-Id: Icd8ec8f401a5ba87d6d9a26dd07062cc003de1e4
S...

1a3cfda4fa139c6e635aae5fa1c01c6c8cbd101f authored about 7 years ago
Android.bp: add Android.bp

This patch cleans Android.mk up by replacing Android.bp.

Change-Id: I2533a0a9ec7fdb451819e5a455...

595231efbd4a74fc20466f0af5d567a848243059 authored about 7 years ago
sload.f2fs: update build for android

This patch updates sload.f2fs for android build.

- do fsck() after sload() to update quota info...

6e21c124dad19bf9213841161a14983d6d31e6d8 authored about 7 years ago
f2fs-tools: allow multiple prog names

This patch allows different prog names like fsck_f2fs, sload_f2fs, etc for
android.

Signed-off-...

10c361a91ec887ac034a7b875d4bf8b7dd5ec708 authored about 7 years ago
mkfs.f2fs: match uid/gid/projid between root inode and quota info

This patch fixes mismatched root inode and quota info.

Signed-off-by: Jaegeuk Kim <jaegeuk@kern...

7561227e8a33a10221e4bffcb268df14757d8263 authored about 7 years ago
mkfs.f2fs: show debug message for quota data writes

This patch shows debugging message for quota.

Signed-off-by: Jaegeuk Kim <[email protected]>

c31e031adb6951b1edb29b5ec79137cd39f01c69 authored about 7 years ago
f2fs-tools: build tools selectively

This patch enables to build tools except mkfs.f2fs selectively.

Signed-off-by: Jaegeuk Kim <jae...

4162b025765e2c31a9971b15ea1a8643ce7b8e8d authored about 7 years ago
libf2fs: propagate error from f2fs_{finalize,fsync}_device

tests/generic/405 of fstest suit expects that mkfs will return error
when it hits EIO, so let's ...

bf3207b41978d4329e106cb12cbd501e4643eaf9 authored about 7 years ago
f2fs-tools: adjust feature name

This patch slightly changes showed feature name.

Before:
Info: superblock features = f9 : encr...

71b8602562d2cd660f2ea75f3ef533adcd7b8548 authored about 7 years ago
f2fs: avoid memory leak in f2fs_write_root_inode

Before exiting f2fs_write_root_inode, we should free in-there allocated
memory.

Signed-off-by: ...

8ae27af7a1373b6e59da15a04baffb845bfc4eb1 authored about 7 years ago
fsck.f2fs: fix potential stack overflow issue

In fsck_chk_inode_blk, we will allocate 256 bytes memory in stack before
traversing sub-director...

d32a5d4263bbce6fbdf0acd562d4e62e956273ea authored about 7 years ago
dump.f2fs: show extra attr only when feature is enabled

If we don't turn on the feature, don't show related info in dumped data.

Signed-off-by: Chao Yu...

6a82c481f185a18fa4d51da7dc932eacc45ca92f authored about 7 years ago
sload.f2fs: update build for android

This patch updates sload.f2fs for android build.

- do fsck() after sload() to update quota info...

bb5aa5cd6c3b43c4d6ba35babe2d40e784690f5e authored about 7 years ago
f2fs-tools: allow multiple prog names

This patch allows different prog names like fsck_f2fs, sload_f2fs, etc for
android.

Signed-off-...

67aeaff06d7e4be1280392c14a824e6616bb316a authored about 7 years ago
mkfs.f2fs: show debug message for quota data writes

This patch shows debugging message for quota.

Signed-off-by: Jaegeuk Kim <[email protected]>

567aaf2ae2e1dd413a8fd496b84e8e95364a77cc authored about 7 years ago
mkfs.f2fs: match uid/gid/projid between root inode and quota info

This patch fixes mismatched root inode and quota info.

Signed-off-by: Jaegeuk Kim <jaegeuk@kern...

6d8aeb2f07f03d8195f5dbb6ffbae6cfeed3750b authored about 7 years ago
Snap for 4476081 from d725da8b005f619ea51dedc5f5bb8a2c80c56b1a to pi-release

Change-Id: I8247258d0a2b3aa4a4fa7b810602aa0ba1834d4e

3887e98fc2e303f8be6171bea3ed5fa74d9f752e authored about 7 years ago
f2fs-tools: build tools selectively

This patch enables to build tools except mkfs.f2fs selectively.

Signed-off-by: Jaegeuk Kim <jae...

3a55b82af862968dff0d16a1480c40e7c858130f authored about 7 years ago
make_f2fs: build it with static libs am: 2f25c50a4d am: 0843dbedfc

am: c0ee764a9f

Change-Id: I6d3c121200f8df5b70e44938e7346da4e2e6af5f

d725da8b005f619ea51dedc5f5bb8a2c80c56b1a authored about 7 years ago
make_f2fs: build it with static libs am: 2f25c50a4d

am: 0843dbedfc

Change-Id: I1d7d60b7a82efb0805310ccc314fc2b075df184d

c0ee764a9f2b13b17ad1214501318434285a8835 authored about 7 years ago
make_f2fs: build it with static libs

am: 2f25c50a4d

Change-Id: I3c68abad4ad91c3d32c3b6b95d64cd2e1bda90d9

0843dbedfc9a65bc54996fcba7cf450e61eb9a6d authored about 7 years ago
make_f2fs: build it with static libs

This fixes build failure.

$ make -j110 static_sdk_tools showcommands dist BUILD_HOST_static=1

...

2f25c50a4db073b54b6b9f5f9eec04c2ca3bcc19 authored about 7 years ago
Snap for 4471243 from 1dde3f4f30883e238474a584cfd03d1b9d3f0a79 to pi-release

Change-Id: Id6ae7ee03f39ff16734e5500b23bd771fe9ffe7d

c1c7a98a7cc62e997e279c5b21f82056c6f0599e authored about 7 years ago
libf2fs: propagate error from f2fs_{finalize,fsync}_device

tests/generic/405 of fstest suit expects that mkfs will return error
when it hits EIO, so let's ...

e813df31940ebe69aa9ba6a5f570ca41d79dde00 authored about 7 years ago
Android.mk: remove obsolete library build am: 0fbd3e0e6b am: 975a708bee

am: 21d3d85419

Change-Id: I7eea355f81d083f5ab7e6608cd36b9f3f795c843

1dde3f4f30883e238474a584cfd03d1b9d3f0a79 authored about 7 years ago
f2fs-tools: define WITH_ANDROID if __ANDROID__ is defined am: 1ffae23e83 am: 29de9004b9

am: c6637020af

Change-Id: I37c9a3b34029823c3bdd00fc830bcd08eb0c7bd9

55f3d06442b195d460d7ad57f8db6c92f85ebeae authored about 7 years ago
f2fs-tools: build for Mac am: 0fb894eb29 am: 59a3b5b2dc

am: 0c57ffdfec

Change-Id: Iee911de4f345eaafdb22d07f4421530994ea1e93

02daad61eab39865861a00dc349470ac5883839b authored about 7 years ago
f2fs-tools: build binaries in Mac am: 106720780a am: 827c14e24f

am: 40b847efa8

Change-Id: Ic27d87d1b46923720165e980e925fc3ff17f7825

677595d6a230f8954b91320d60f3cf19c2eaaa7d authored about 7 years ago
lib/libf2fs.c: include <sys/sysmacros.h> am: cc9219f1bd am: 54104ffa4f

am: 9ec13c472f

Change-Id: Ic9a164948ef965bc1bcb0dcd618157f1bb42fe50

973072dc6cf401dfed9ba5542f57803919331ed0 authored about 7 years ago
fsck/Makefile.am, mkfs/Makefile.am: fix to `make distcheck` correctly am: 65ce8335cc am: 1fe941fcc4

am: 75517eb7c7

Change-Id: Iae766762ae4f8b3f1cca41cb8b3cce9ba57f8355

43eaf99c613e79c815d1cec89e60f61d45bf549a authored about 7 years ago
Android.mk: remove obsolete library build am: 0fbd3e0e6b

am: 975a708bee

Change-Id: I8358f7a6a4515e27a84568f1ca2f29e25bc8f968

21d3d854196f20eddb137ddf05e21a4cf944c035 authored about 7 years ago
f2fs-tools: define WITH_ANDROID if __ANDROID__ is defined am: 1ffae23e83

am: 29de9004b9

Change-Id: If045ad6f6dcc145760a95626c079cc5b1a7693a6

c6637020afddcafeccee50c511bd2663452e0a78 authored about 7 years ago
f2fs-tools: build for Mac am: 0fb894eb29

am: 59a3b5b2dc

Change-Id: I76e8e9080daf01e0504d0d678718c506cf9407d1

0c57ffdfec361a827b87dbf925c16fd7f48c39d1 authored about 7 years ago
f2fs-tools: build binaries in Mac am: 106720780a

am: 827c14e24f

Change-Id: Ied018834551e17f357f5c4873fb71ca00148d7e9

40b847efa82654f2bc5d2227cf010f418bf35e9d authored about 7 years ago
lib/libf2fs.c: include <sys/sysmacros.h> am: cc9219f1bd

am: 54104ffa4f

Change-Id: Iad6f5a397488960681d3b959c5c1022963f45da8

9ec13c472fdfc015ae66326683882ad9ba0f88c2 authored about 7 years ago
fsck/Makefile.am, mkfs/Makefile.am: fix to `make distcheck` correctly am: 65ce8335cc

am: 1fe941fcc4

Change-Id: I388f3173e5127f1c43b4bf3b98a791c16fddf16b

75517eb7c7e584a2d0179ed39cb9262ee03d67ec authored about 7 years ago
Android.mk: remove obsolete library build

am: 0fbd3e0e6b

Change-Id: Iee913d2d1c2b60d96ebdb78098a4513b629966ac

975a708beed67ac6af195734fa56ab63c90fb830 authored about 7 years ago
f2fs-tools: define WITH_ANDROID if __ANDROID__ is defined

am: 1ffae23e83

Change-Id: I0bfdeff9e07d86f69b0ccc71da5e8928a8c63021

29de9004b9f8f262bcfd4af5bae731c322c8a7e7 authored about 7 years ago
f2fs-tools: build for Mac

am: 0fb894eb29

Change-Id: If9e450320d7a52cbfd9b36ad7018759554321563

59a3b5b2dca42b32369c88f8752863f32f3af20b authored about 7 years ago
f2fs-tools: build binaries in Mac

am: 106720780a

Change-Id: I51d8771375fb5834c605e6ec02c881044cbd1439

827c14e24fa66a5df194381a30215903b848bf5c authored about 7 years ago
lib/libf2fs.c: include <sys/sysmacros.h>

am: cc9219f1bd

Change-Id: Ib3a748381b8e5c3bc8e09b738745499a678a3c40

54104ffa4f8ed5e1fabc1856c9ea0f397d4234f8 authored about 7 years ago
fsck/Makefile.am, mkfs/Makefile.am: fix to `make distcheck` correctly

am: 65ce8335cc

Change-Id: Iaef8cbabb0003c0864fe8e8d3daf4b0bdcc245da

1fe941fcc471d625e648a961728b675f3efda7d0 authored about 7 years ago
f2fs-tools: adjust feature name

This patch slightly changes showed feature name.

Before:
Info: superblock features = f9 : encr...

269c86ce7c046d704e6f5b4e0342cc4a79bbfde4 authored about 7 years ago
f2fs: avoid memory leak in f2fs_write_root_inode

Before exiting f2fs_write_root_inode, we should free in-there allocated
memory.

Signed-off-by: ...

bad43e38fc25245b23f18503099f5a728149576a authored about 7 years ago
fsck.f2fs: fix potential stack overflow issue

In fsck_chk_inode_blk, we will allocate 256 bytes memory in stack before
traversing sub-director...

877821c8b51c8c1e7480e2e2ad62c36588d52218 authored about 7 years ago
dump.f2fs: show extra attr only when feature is enabled

If we don't turn on the feature, don't show related info in dumped data.

Signed-off-by: Chao Yu...

2a8d6909deb358588db9db07dfebc91f167617f4 authored about 7 years ago
Android.mk: remove obsolete library build

This was used for system/extra/f2fs_utils.

Change-Id: I2541e506d2f4ea8aa74bc80d850fc0f6a9689737...

0fbd3e0e6b808e96100876b3bf0720fbb40abb58 authored about 7 years ago
f2fs-tools: define WITH_ANDROID if __ANDROID__ is defined

This matches with __ANDROID__ with WITH_ANDROID.

Signed-off-by: Jaegeuk Kim <[email protected]>

1ffae23e83c49d73dab80dfd4cac653c1b86b2d2 authored about 7 years ago
f2fs-tools: build for Mac

Bug: 69298953
Change-Id: I1d38fc7ed2bffe07329ae1256419155112a01929
Signed-off-by: Jaegeuk Kim <j...

0fb894eb29ff0dd76f46b0bf1ecc111609ed1c05 authored about 7 years ago
f2fs-tools: build binaries in Mac

This patch modifies f2fs-tools to be built in mac.

Change-Id: Ib341e2255b86cb07a7809a83237d9af6...

106720780ab71c8d17a4f92379e1f9cb6cd0417d authored about 7 years ago
lib/libf2fs.c: include <sys/sysmacros.h>

The macros `major' and `minor' have been moved from <sys/types.h>
to <sys/sysmacros.h>. We incl...

cc9219f1bd3cfe708a0c9667332e9843b24c12fb authored about 7 years ago
fsck/Makefile.am, mkfs/Makefile.am: fix to `make distcheck` correctly

We add noinst_HEADERS to include header files which are needed to build
but which do not need to...

65ce8335cc0d99fe60b7738d606079f826e6406e authored about 7 years ago
f2fs-tools: define WITH_ANDROID if __ANDROID__ is defined

This matches with __ANDROID__ with WITH_ANDROID.

Signed-off-by: Jaegeuk Kim <[email protected]>

c8de435a18b6e69a8091cfe25f4510168563a52f authored about 7 years ago
Snap for 4453288 from 140b785f437fb746b0c2ec28d1eb942cf765f7da to pi-release

Change-Id: Ia34643e3bd6de35e7a88dfd08a12add6f02754cb

a2202b82446f14302409fece2f47212efa82f698 authored about 7 years ago
f2fs-tools: build binaries in Mac

This patch modifies f2fs-tools to be built in mac.

Signed-off-by: Jaegeuk Kim <[email protected]>

43bb7b6c99fa49cd5c58153068f4a54aebd7bfb8 authored about 7 years ago
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD

am: 5f6ea84749

Change-Id: Ia176a3fdea0daf34edaf16d3733e723c446a89df

140b785f437fb746b0c2ec28d1eb942cf765f7da authored about 7 years ago
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD

Change-Id: Ice4a77e7dd44d0e9732a6e7192d55dd5e0efc5d6

5f6ea84749534fa8e925a1591bf258116eae3b13 authored about 7 years ago